[#602] metrics: Rename blobovnicza size metric

`Size` is not size, but open db size.

Signed-off-by: Dmitrii Stepanov <d.stepanov@yadro.com>

.docker/Dockerfile.adm

@@ -1,4 +1,4 @@
-FROM golang:1.20 as builder
+FROM golang:1.21 as builder
 ARG BUILD=now
 ARG VERSION=dev
 ARG REPO=repository

.docker/Dockerfile.ci

@@ -1,4 +1,4 @@
-FROM golang:1.20
+FROM golang:1.21
 
 WORKDIR /tmp
 

.docker/Dockerfile.cli

@@ -1,4 +1,4 @@
-FROM golang:1.20 as builder
+FROM golang:1.21 as builder
 ARG BUILD=now
 ARG VERSION=dev
 ARG REPO=repository

.docker/Dockerfile.ir

@@ -1,4 +1,4 @@
-FROM golang:1.20 as builder
+FROM golang:1.21 as builder
 ARG BUILD=now
 ARG VERSION=dev
 ARG REPO=repository

.docker/Dockerfile.storage

@@ -1,4 +1,4 @@
-FROM golang:1.20 as builder
+FROM golang:1.21 as builder
 ARG BUILD=now
 ARG VERSION=dev
 ARG REPO=repository

.forgejo/workflows/build.yml

@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        go_versions: [ '1.19', '1.20' ]
+        go_versions: [ '1.20', '1.21' ]
 
     steps:
       - uses: actions/checkout@v3

.forgejo/workflows/dco.yml

@@ -0,0 +1,21 @@
+name: DCO action
+on: [pull_request]
+
+jobs:
+  dco:
+    name: DCO
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+
+      - name: Setup Go
+        uses: actions/setup-go@v3
+        with:
+          go-version: '1.21'
+
+      - name: Run commit format checker
+        uses: https://git.frostfs.info/TrueCloudLab/dco-go@v2
+        with:
+          from: 'origin/${{ github.event.pull_request.base.ref }}'

.forgejo/workflows/tests.yml

@@ -11,20 +11,21 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v3
         with:
-          go-version: '1.20'
+          go-version: '1.21'
           cache: true
 
-      - name: golangci-lint
-        uses: https://github.com/golangci/golangci-lint-action@v3
-        with:
-          version: latest
+      - name: Install linters
+        run: make lint-install
+
+      - name: Run linters
+        run: make lint
 
   tests:
     name: Tests
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        go_versions: [ '1.19', '1.20' ]
+        go_versions: [ '1.20', '1.21' ]
       fail-fast: false
     steps:
       - uses: actions/checkout@v3
@@ -47,8 +48,26 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v3
         with:
-          go-version: '1.20'
+          go-version: '1.21'
           cache: true
 
       - name: Run tests
         run: go test ./... -count=1 -race
+
+  staticcheck:
+    name: Staticcheck
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Set up Go
+        uses: actions/setup-go@v3
+        with:
+          go-version: '1.21'
+          cache: true
+
+      - name: Install staticcheck
+        run: make staticcheck-install
+
+      - name: Run staticcheck
+        run: make staticcheck-run

.forgejo/workflows/vulncheck.yml

@@ -0,0 +1,22 @@
+name: Vulncheck
+on: [pull_request]
+
+jobs:
+  vulncheck:
+    name: Vulncheck
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+
+      - name: Setup Go
+        uses: actions/setup-go@v3
+        with:
+          go-version: '1.21'
+
+      - name: Install govulncheck
+        run: go install golang.org/x/vuln/cmd/govulncheck@latest
+
+      - name: Run govulncheck
+        run: govulncheck ./...

.golangci.yml

@@ -31,6 +31,20 @@ linters-settings:
     statements: 60 # default 40
   gocognit:
     min-complexity: 40 # default 30
+  importas:
+    no-unaliased: true
+    no-extra-aliases: false
+    alias:
+      pkg: git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object
+      alias: objectSDK
+  custom:
+    noliteral:
+      path: bin/external_linters.so
+      original-url: git.frostfs.info/TrueCloudLab/linters.git
+      settings:
+        target-methods : ["reportFlushError", "reportError"]
+        disable-packages: ["codes", "err", "res","exec"]
+        constants-package: "git.frostfs.info/TrueCloudLab/frostfs-node/internal/logs"
 
 linters:
   enable:
@@ -62,5 +76,7 @@ linters:
     - funlen
     - gocognit
     - contextcheck
+    - importas
+    - noliteral
   disable-all: true
   fast: false

.pre-commit-config.yaml

@@ -30,10 +30,13 @@ repos:
     hooks:
       - id: shellcheck
 
-  - repo: https://github.com/golangci/golangci-lint
-    rev: v1.52.2
+  - repo: local
     hooks:
-      - id: golangci-lint
+      - id: make-lint
+        name: Run Make Lint
+        entry: make lint
+        language: system
+        pass_filenames: false
 
   - repo: local
     hooks:

CHANGELOG.md

@@ -36,7 +36,7 @@ Changelog for FrostFS Node
 - `github.com/multiformats/go-multiaddr` to `v0.9.0`
 - `github.com/hashicorp/golang-lru/v2` to `v2.0.2`
 - `go.uber.org/atomic` to `v1.11.0`
-- Minimum go version to v1.19
+- Minimum go version to v1.20
 - `github.com/prometheus/client_golang` to `v1.15.1`
 - `github.com/prometheus/client_model` to `v0.4.0`
 - `go.opentelemetry.io/otel` to `v1.15.1`

CONTRIBUTING.md

@@ -3,8 +3,8 @@
 First, thank you for contributing! We love and encourage pull requests from
 everyone. Please follow the guidelines:
 
-- Check the open [issues](https://github.com/TrueCloudLab/frostfs-node/issues) and
-  [pull requests](https://github.com/TrueCloudLab/frostfs-node/pulls) for existing
+- Check the open [issues](https://git.frostfs.info/TrueCloudLab/frostfs-node/issues) and
+  [pull requests](https://git.frostfs.info/TrueCloudLab/frostfs-node/pulls) for existing
   discussions.
 
 - Open an issue first, to discuss a new feature or enhancement.
@@ -27,19 +27,19 @@ Start by forking the `frostfs-node` repository, make changes in a branch and the
 send a pull request. We encourage pull requests to discuss code changes. Here
 are the steps in details:
 
-### Set up your GitHub Repository
-Fork [FrostFS node upstream](https://github.com/TrueCloudLab/frostfs-node/fork) source
+### Set up your Forgejo repository
+Fork [FrostFS node upstream](https://git.frostfs.info/TrueCloudLab/frostfs-node) source
 repository to your own personal repository. Copy the URL of your fork (you will
 need it for the `git clone` command below).
 
 ```sh
-$ git clone https://github.com/TrueCloudLab/frostfs-node
+$ git clone https://git.frostfs.info/TrueCloudLab/frostfs-node
 ```
 
 ### Set up git remote as ``upstream``
 ```sh
 $ cd frostfs-node
-$ git remote add upstream https://github.com/TrueCloudLab/frostfs-node
+$ git remote add upstream https://git.frostfs.info/TrueCloudLab/frostfs-node
 $ git fetch upstream
 $ git merge upstream/master
 ...
@@ -58,7 +58,7 @@ $ git checkout -b feature/123-something_awesome
 After your code changes, make sure
 
 - To add test cases for the new code.
-- To run `make lint`
+- To run `make lint` and `make staticcheck-run`
 - To squash your commits into a single commit or a series of logically separated
   commits run `git rebase -i`. It's okay to force update your pull request.
 - To run `make test` and `make all` completes.
@@ -89,8 +89,8 @@ $ git push origin feature/123-something_awesome
 ```
 
 ### Create a Pull Request
-Pull requests can be created via GitHub. Refer to [this
-document](https://help.github.com/articles/creating-a-pull-request/) for
+Pull requests can be created via Forgejo. Refer to [this
+document](https://docs.codeberg.org/collaborating/pull-requests-and-git-flow/) for
 detailed steps on how to create a pull request. After a Pull Request gets peer
 reviewed and approved, it will be merged.
 

Makefile

@@ -7,8 +7,8 @@ VERSION ?= $(shell git describe --tags --dirty --match "v*" --always --abbrev=8
 HUB_IMAGE ?= truecloudlab/frostfs
 HUB_TAG ?= "$(shell echo ${VERSION} | sed 's/^v//')"
 
-GO_VERSION ?= 1.19
-LINT_VERSION ?= 1.52.2
+GO_VERSION ?= 1.21
+LINT_VERSION ?= 1.54.0
 ARCH = amd64
 
 BIN = bin
@@ -25,6 +25,10 @@ PKG_VERSION ?= $(shell echo $(VERSION) | sed "s/^v//" | \
 			sed -E "s/(.*)-(g[a-fA-F0-9]{6,8})(.*)/\1\3~\2/" | \
 			sed "s/-/~/")-${OS_RELEASE}
 
+OUTPUT_LINT_DIR ?= $(shell pwd)/bin
+LINT_DIR = $(OUTPUT_LINT_DIR)/golangci-lint-$(LINT_VERSION)
+TMP_DIR := .cache
+
 .PHONY: help all images dep clean fmts fmt imports test lint docker/lint
 		prepare-release debpackage pre-commit unpre-commit
 
@@ -131,12 +135,30 @@ test:
 pre-commit-run:
 	@pre-commit run -a --hook-stage manual
 
+# Install linters
+lint-install:
+	@mkdir -p $(TMP_DIR)
+	@rm -rf $(TMP_DIR)/linters
+	@git clone --depth 1 https://git.frostfs.info/TrueCloudLab/linters.git $(TMP_DIR)/linters
+	@@make -C $(TMP_DIR)/linters lib CGO_ENABLED=1 OUT_DIR=$(OUTPUT_LINT_DIR)
+	@rm -rf $(TMP_DIR)/linters
+	@rmdir $(TMP_DIR) 2>/dev/null || true
+	@CGO_ENABLED=1 GOBIN=$(LINT_DIR) go install github.com/golangci/golangci-lint/cmd/golangci-lint@v$(LINT_VERSION)
+
 # Run linters
 lint:
-	@golangci-lint --timeout=5m run
+	@if [ ! -d "$(LINT_DIR)" ]; then \
+		echo "Run make lint-install"; \
+		exit 1; \
+	fi
+	$(LINT_DIR)/golangci-lint run
+
+# Install staticcheck
+staticcheck-install:
+	@go install honnef.co/go/tools/cmd/staticcheck@latest
 
 # Run staticcheck
-staticcheck:
+staticcheck-run:
 	@staticcheck ./...
 
 # Run linters in Docker

README.md

@@ -49,7 +49,7 @@ The latest version of frostfs-node works with frostfs-contract
 
 # Building
 
-To make all binaries you need Go 1.19+ and `make`:
+To make all binaries you need Go 1.20+ and `make`:
 ```
 make all
 ```

cmd/frostfs-adm/README.md

@@ -36,9 +36,7 @@ alphabet-wallets: /path            # path to consensus node / alphabet wallets s
 network:
   max_object_size: 67108864 # max size of a single FrostFS object, bytes
   epoch_duration: 240       # duration of a FrostFS epoch in blocks, consider block generation frequency in the sidechain
-  basic_income_rate: 0      # basic income rate, for private consider 0
   fee:
-    audit: 0     # network audit fee, for private installation consider 0
     candidate: 0 # inner ring candidate registration fee, for private installation consider 0
     container: 0 # container creation fee, for private installation consider 0
     container_alias: 0 # container nice-name registration fee, for private installation consider 0

cmd/frostfs-adm/docs/deploy.md

@@ -34,9 +34,7 @@ alphabet-wallets: /home/user/deploy/alphabet-wallets
 network:
   max_object_size: 67108864
   epoch_duration: 240
-  basic_income_rate: 0
   fee:
-    audit: 0
     candidate: 0
     container: 0
     withdraw: 0
@@ -142,7 +140,6 @@ Waiting for transactions to persist...
 Stage 7: set addresses in NNS.
 Waiting for transactions to persist...
 NNS: Set alphabet0.frostfs -> f692dfb4d43a15b464eb51a7041160fb29c44b6a
-NNS: Set audit.frostfs -> 7df847b993affb3852074345a7c2bd622171ee0d
 NNS: Set balance.frostfs -> 103519b3067a66307080a66570c0491ee8f68879
 NNS: Set container.frostfs -> cae60bdd689d185901e495352d0247752ce50846
 NNS: Set frostfsid.frostfs -> c421fb60a3895865a8f24d197d6a80ef686041d2

cmd/frostfs-adm/internal/modules/config/config.go

@@ -18,8 +18,6 @@ type configTemplate struct {
 	AlphabetDir             string
 	MaxObjectSize           int
 	EpochDuration           int
-	BasicIncomeRate         int
-	AuditFee                int
 	CandidateFee            int
 	ContainerFee            int
 	ContainerAliasFee       int
@@ -33,10 +31,8 @@ alphabet-wallets: {{ .AlphabetDir}}
 network:
   max_object_size: {{ .MaxObjectSize}}
   epoch_duration: {{ .EpochDuration}}
-  basic_income_rate: {{ .BasicIncomeRate}}
   homomorphic_hash_disabled: {{ .HomomorphicHashDisabled}}
   fee:
-    audit: {{ .AuditFee}}
     candidate: {{ .CandidateFee}}
     container: {{ .ContainerFee}}
     container_alias: {{ .ContainerAliasFee }}
@@ -111,9 +107,7 @@ func generateConfigExample(appDir string, credSize int) (string, error) {
 		Endpoint:                "https://neo.rpc.node:30333",
 		MaxObjectSize:           67108864,      // 64 MiB
 		EpochDuration:           240,           // 1 hour with 15s per block
-		BasicIncomeRate:         1_0000_0000,   // 0.0001 GAS per GiB (Fixed12)
 		HomomorphicHashDisabled: false,         // object homomorphic hash is enabled
-		AuditFee:                1_0000,        // 0.00000001 GAS per audit (Fixed12)
 		CandidateFee:            100_0000_0000, // 100.0 GAS (Fixed8)
 		ContainerFee:            1000,          // 0.000000001 * 7 GAS per container (Fixed12)
 		ContainerAliasFee:       500,           // ContainerFee / 2

cmd/frostfs-adm/internal/modules/config/config_test.go

@@ -28,8 +28,6 @@ func TestGenerateConfigExample(t *testing.T) {
 	require.Equal(t, filepath.Join(appDir, "alphabet-wallets"), v.GetString("alphabet-wallets"))
 	require.Equal(t, 67108864, v.GetInt("network.max_object_size"))
 	require.Equal(t, 240, v.GetInt("network.epoch_duration"))
-	require.Equal(t, 100000000, v.GetInt("network.basic_income_rate"))
-	require.Equal(t, 10000, v.GetInt("network.fee.audit"))
 	require.Equal(t, 10000000000, v.GetInt("network.fee.candidate"))
 	require.Equal(t, 1000, v.GetInt("network.fee.container"))
 	require.Equal(t, 100000000, v.GetInt("network.fee.withdraw"))

cmd/frostfs-adm/internal/modules/morph/config.go

@@ -54,8 +54,7 @@ func dumpNetworkConfig(cmd *cobra.Command, _ []string) error {
 	}
 	for k, v := range m {
 		switch k {
-		case netmap.AuditFeeConfig, netmap.BasicIncomeRateConfig,
-			netmap.ContainerFeeConfig, netmap.ContainerAliasFeeConfig,
+		case netmap.ContainerFeeConfig, netmap.ContainerAliasFeeConfig,
 			netmap.EpochDurationConfig, netmap.IrCandidateFeeConfig,
 			netmap.MaxObjectSizeConfig, netmap.WithdrawFeeConfig:
 			nbuf := make([]byte, 8)
@@ -134,8 +133,7 @@ func parseConfigPair(kvStr string, force bool) (key string, val any, err error)
 	valRaw := v
 
 	switch key {
-	case netmap.AuditFeeConfig, netmap.BasicIncomeRateConfig,
-		netmap.ContainerFeeConfig, netmap.ContainerAliasFeeConfig,
+	case netmap.ContainerFeeConfig, netmap.ContainerAliasFeeConfig,
 		netmap.EpochDurationConfig, netmap.IrCandidateFeeConfig,
 		netmap.MaxObjectSizeConfig, netmap.WithdrawFeeConfig:
 		val, err = strconv.ParseInt(valRaw, 10, 64)

cmd/frostfs-adm/internal/modules/morph/epoch.go

@@ -3,6 +3,7 @@ package morph
 import (
 	"errors"
 	"fmt"
+	"strings"
 
 	"github.com/nspcc-dev/neo-go/pkg/io"
 	"github.com/nspcc-dev/neo-go/pkg/rpcclient/unwrap"
@@ -38,7 +39,14 @@ func forceNewEpochCmd(cmd *cobra.Command, _ []string) error {
 		return err
 	}
 
-	return wCtx.awaitTx()
+	if err := wCtx.awaitTx(); err != nil {
+		if strings.Contains(err.Error(), "invalid epoch") {
+			cmd.Println("Epoch has already ticked.")
+			return nil
+		}
+		return err
+	}
+	return nil
 }
 
 func emitNewEpochCall(bw *io.BufBinWriter, wCtx *initializeContext, nmHash util.Uint160) error {

cmd/frostfs-adm/internal/modules/morph/generate.go

@@ -104,8 +104,7 @@ func initializeWallets(v *viper.Viper, walletDir string, size int) ([]string, er
 	bftCount := smartcontract.GetDefaultHonestNodeCount(size)
 	for i := range wallets {
 		i := i
-		ps := make(keys.PublicKeys, len(pubs))
-		copy(ps, pubs)
+		ps := pubs.Copy()
 		errG.Go(func() error {
 			if err := addMultisigAccount(wallets[i], majCount, committeeAccountName, passwords[i], ps); err != nil {
 				return fmt.Errorf("can't create committee account: %w", err)

cmd/frostfs-adm/internal/modules/morph/generate_test.go

@@ -75,6 +75,7 @@ func TestGenerateAlphabet(t *testing.T) {
 	var wg sync.WaitGroup
 	for i := uint64(0); i < size; i++ {
 		i := i
+		wg.Add(1)
 		go func() {
 			defer wg.Done()
 			p := filepath.Join(walletDir, innerring.GlagoliticLetter(i).String()+".json")

cmd/frostfs-adm/internal/modules/morph/initialize.go

@@ -210,11 +210,11 @@ func validateInit(cmd *cobra.Command) error {
 func createClient(cmd *cobra.Command, v *viper.Viper, wallets []*wallet.Wallet) (Client, error) {
 	var c Client
 	var err error
-	if v.GetString(localDumpFlag) != "" {
-		if v.GetString(endpointFlag) != "" {
+	if ldf := cmd.Flags().Lookup(localDumpFlag); ldf != nil && ldf.Changed {
+		if cmd.Flags().Changed(endpointFlag) {
 			return nil, fmt.Errorf("`%s` and `%s` flags are mutually exclusive", endpointFlag, localDumpFlag)
 		}
-		c, err = newLocalClient(cmd, v, wallets)
+		c, err = newLocalClient(cmd, v, wallets, ldf.Value.String())
 	} else {
 		c, err = getN3Client(v)
 	}

cmd/frostfs-adm/internal/modules/morph/initialize_deploy.go

@@ -41,7 +41,6 @@ const (
 	frostfsContract    = "frostfs"    // not deployed in side-chain.
 	processingContract = "processing" // not deployed in side-chain.
 	alphabetContract   = "alphabet"
-	auditContract      = "audit"
 	balanceContract    = "balance"
 	containerContract  = "container"
 	frostfsIDContract  = "frostfsid"
@@ -51,7 +50,6 @@ const (
 
 var (
 	contractList = []string{
-		auditContract,
 		balanceContract,
 		containerContract,
 		frostfsIDContract,
@@ -69,10 +67,8 @@ var (
 	netmapConfigKeys = []string{
 		netmap.EpochDurationConfig,
 		netmap.MaxObjectSizeConfig,
-		netmap.AuditFeeConfig,
 		netmap.ContainerFeeConfig,
 		netmap.ContainerAliasFeeConfig,
-		netmap.BasicIncomeRateConfig,
 		netmap.IrCandidateFeeConfig,
 		netmap.WithdrawFeeConfig,
 		netmap.HomomorphicHashingDisabledKey,
@@ -533,8 +529,6 @@ func (c *initializeContext) getContractDeployData(ctrName string, keysParam []an
 	case processingContract:
 		items = append(items, c.Contracts[frostfsContract].Hash)
 		return items[1:] // no notary info
-	case auditContract:
-		items = append(items, c.Contracts[netmapContract].Hash)
 	case balanceContract:
 		items = append(items,
 			c.Contracts[netmapContract].Hash,

cmd/frostfs-adm/internal/modules/morph/local_client.go

@@ -51,7 +51,7 @@ type localClient struct {
 	maxGasInvoke int64
 }
 
-func newLocalClient(cmd *cobra.Command, v *viper.Viper, wallets []*wallet.Wallet) (*localClient, error) {
+func newLocalClient(cmd *cobra.Command, v *viper.Viper, wallets []*wallet.Wallet, dumpPath string) (*localClient, error) {
 	cfg, err := config.LoadFile(v.GetString(protoConfigPath))
 	if err != nil {
 		return nil, err
@@ -87,7 +87,6 @@ func newLocalClient(cmd *cobra.Command, v *viper.Viper, wallets []*wallet.Wallet
 
 	go bc.Run()
 
-	dumpPath := v.GetString(localDumpFlag)
 	if cmd.Name() != "init" {
 		f, err := os.OpenFile(dumpPath, os.O_RDONLY, 0600)
 		if err != nil {

cmd/frostfs-adm/internal/modules/morph/netmap_util.go

@@ -12,10 +12,8 @@ func getDefaultNetmapContractConfigMap() map[string]any {
 	m := make(map[string]any)
 	m[netmap.EpochDurationConfig] = viper.GetInt64(epochDurationInitFlag)
 	m[netmap.MaxObjectSizeConfig] = viper.GetInt64(maxObjectSizeInitFlag)
-	m[netmap.AuditFeeConfig] = viper.GetInt64(auditFeeInitFlag)
 	m[netmap.ContainerFeeConfig] = viper.GetInt64(containerFeeInitFlag)
 	m[netmap.ContainerAliasFeeConfig] = viper.GetInt64(containerAliasFeeInitFlag)
-	m[netmap.BasicIncomeRateConfig] = viper.GetInt64(incomeRateInitFlag)
 	m[netmap.IrCandidateFeeConfig] = viper.GetInt64(candidateFeeInitFlag)
 	m[netmap.WithdrawFeeConfig] = viper.GetInt64(withdrawFeeInitFlag)
 	m[netmap.HomomorphicHashingDisabledKey] = viper.GetBool(homomorphicHashDisabledInitFlag)

cmd/frostfs-adm/internal/modules/morph/root.go

@@ -18,10 +18,6 @@ const (
 	maxObjectSizeCLIFlag            = "max-object-size"
 	epochDurationInitFlag           = "network.epoch_duration"
 	epochDurationCLIFlag            = "epoch-duration"
-	incomeRateInitFlag              = "network.basic_income_rate"
-	incomeRateCLIFlag               = "basic-income-rate"
-	auditFeeInitFlag                = "network.fee.audit"
-	auditFeeCLIFlag                 = "audit-fee"
 	containerFeeInitFlag            = "network.fee.container"
 	containerAliasFeeInitFlag       = "network.fee.container_alias"
 	containerFeeCLIFlag             = "container-fee"
@@ -69,15 +65,12 @@ var (
 			_ = viper.BindPFlag(endpointFlag, cmd.Flags().Lookup(endpointFlag))
 			_ = viper.BindPFlag(epochDurationInitFlag, cmd.Flags().Lookup(epochDurationCLIFlag))
 			_ = viper.BindPFlag(maxObjectSizeInitFlag, cmd.Flags().Lookup(maxObjectSizeCLIFlag))
-			_ = viper.BindPFlag(incomeRateInitFlag, cmd.Flags().Lookup(incomeRateCLIFlag))
 			_ = viper.BindPFlag(homomorphicHashDisabledInitFlag, cmd.Flags().Lookup(homomorphicHashDisabledCLIFlag))
-			_ = viper.BindPFlag(auditFeeInitFlag, cmd.Flags().Lookup(auditFeeCLIFlag))
 			_ = viper.BindPFlag(candidateFeeInitFlag, cmd.Flags().Lookup(candidateFeeCLIFlag))
 			_ = viper.BindPFlag(containerFeeInitFlag, cmd.Flags().Lookup(containerFeeCLIFlag))
 			_ = viper.BindPFlag(containerAliasFeeInitFlag, cmd.Flags().Lookup(containerAliasFeeCLIFlag))
 			_ = viper.BindPFlag(withdrawFeeInitFlag, cmd.Flags().Lookup(withdrawFeeCLIFlag))
 			_ = viper.BindPFlag(protoConfigPath, cmd.Flags().Lookup(protoConfigPath))
-			_ = viper.BindPFlag(localDumpFlag, cmd.Flags().Lookup(localDumpFlag))
 		},
 		RunE: initializeSideChainCmd,
 	}

cmd/frostfs-adm/internal/modules/root.go

@@ -45,7 +45,7 @@ func init() {
 	rootCmd.AddCommand(storagecfg.RootCmd)
 
 	rootCmd.AddCommand(autocomplete.Command("frostfs-adm"))
-	rootCmd.AddCommand(gendoc.Command(rootCmd))
+	rootCmd.AddCommand(gendoc.Command(rootCmd, gendoc.Options{}))
 }
 
 func Execute() error {

cmd/frostfs-cli/internal/client/client.go

@@ -13,7 +13,7 @@ import (
 	cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id"
 	"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/eacl"
 	"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/netmap"
-	"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object"
+	objectSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object"
 	oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id"
 	"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/version"
 )
@@ -70,8 +70,8 @@ func ListContainers(ctx context.Context, prm ListContainersPrm) (res ListContain
 
 // PutContainerPrm groups parameters of PutContainer operation.
 type PutContainerPrm struct {
-	commonPrm
-	client.PrmContainerPut
+	Client       *client.Client
+	ClientParams client.PrmContainerPut
 }
 
 // PutContainerRes groups the resulting values of PutContainer operation.
@@ -93,7 +93,7 @@ func (x PutContainerRes) ID() cid.ID {
 //
 // Returns any error which prevented the operation from completing correctly in error return.
 func PutContainer(ctx context.Context, prm PutContainerPrm) (res PutContainerRes, err error) {
-	cliRes, err := prm.cli.ContainerPut(ctx, prm.PrmContainerPut)
+	cliRes, err := prm.Client.ContainerPut(ctx, prm.ClientParams)
 	if err == nil {
 		res.cnr = cliRes.ID()
 	}
@@ -103,13 +103,15 @@ func PutContainer(ctx context.Context, prm PutContainerPrm) (res PutContainerRes
 
 // GetContainerPrm groups parameters of GetContainer operation.
 type GetContainerPrm struct {
-	commonPrm
-	cliPrm client.PrmContainerGet
+	Client       *client.Client
+	ClientParams client.PrmContainerGet
 }
 
 // SetContainer sets identifier of the container to be read.
+//
+// Deprecated: Use GetContainerPrm.ClientParams.ContainerID instead.
 func (x *GetContainerPrm) SetContainer(id cid.ID) {
-	x.cliPrm.SetContainer(id)
+	x.ClientParams.ContainerID = &id
 }
 
 // GetContainerRes groups the resulting values of GetContainer operation.
@@ -126,7 +128,7 @@ func (x GetContainerRes) Container() containerSDK.Container {
 //
 // Returns any error which prevented the operation from completing correctly in error return.
 func GetContainer(ctx context.Context, prm GetContainerPrm) (res GetContainerRes, err error) {
-	res.cliRes, err = prm.cli.ContainerGet(ctx, prm.cliPrm)
+	res.cliRes, err = prm.Client.ContainerGet(ctx, prm.ClientParams)
 
 	return
 }
@@ -134,9 +136,12 @@ func GetContainer(ctx context.Context, prm GetContainerPrm) (res GetContainerRes
 // IsACLExtendable checks if ACL of the container referenced by the given identifier
 // can be extended. Client connection MUST BE correctly established in advance.
 func IsACLExtendable(ctx context.Context, c *client.Client, cnr cid.ID) (bool, error) {
-	var prm GetContainerPrm
-	prm.SetClient(c)
-	prm.SetContainer(cnr)
+	prm := GetContainerPrm{
+		Client: c,
+		ClientParams: client.PrmContainerGet{
+			ContainerID: &cnr,
+		},
+	}
 
 	res, err := GetContainer(ctx, prm)
 	if err != nil {
@@ -148,8 +153,8 @@ func IsACLExtendable(ctx context.Context, c *client.Client, cnr cid.ID) (bool, e
 
 // DeleteContainerPrm groups parameters of DeleteContainerPrm operation.
 type DeleteContainerPrm struct {
-	commonPrm
-	client.PrmContainerDelete
+	Client       *client.Client
+	ClientParams client.PrmContainerDelete
 }
 
 // DeleteContainerRes groups the resulting values of DeleteContainer operation.
@@ -164,7 +169,7 @@ type DeleteContainerRes struct{}
 //
 // Returns any error which prevented the operation from completing correctly in error return.
 func DeleteContainer(ctx context.Context, prm DeleteContainerPrm) (res DeleteContainerRes, err error) {
-	_, err = prm.cli.ContainerDelete(ctx, prm.PrmContainerDelete)
+	_, err = prm.Client.ContainerDelete(ctx, prm.ClientParams)
 
 	return
 }
@@ -331,17 +336,17 @@ type PutObjectPrm struct {
 
 	copyNum []uint32
 
-	hdr *object.Object
+	hdr *objectSDK.Object
 
 	rdr io.Reader
 
-	headerCallback func(*object.Object)
+	headerCallback func(*objectSDK.Object)
 
 	prepareLocally bool
 }
 
 // SetHeader sets object header.
-func (x *PutObjectPrm) SetHeader(hdr *object.Object) {
+func (x *PutObjectPrm) SetHeader(hdr *objectSDK.Object) {
 	x.hdr = hdr
 }
 
@@ -352,7 +357,7 @@ func (x *PutObjectPrm) SetPayloadReader(rdr io.Reader) {
 
 // SetHeaderCallback sets callback which is called on the object after the header is received
 // but before the payload is written.
-func (x *PutObjectPrm) SetHeaderCallback(f func(*object.Object)) {
+func (x *PutObjectPrm) SetHeaderCallback(f func(*objectSDK.Object)) {
 	x.headerCallback = f
 }
 
@@ -532,22 +537,22 @@ type GetObjectPrm struct {
 	objectAddressPrm
 	rawPrm
 	payloadWriterPrm
-	headerCallback func(*object.Object)
+	headerCallback func(*objectSDK.Object)
 }
 
 // SetHeaderCallback sets callback which is called on the object after the header is received
 // but before the payload is written.
-func (p *GetObjectPrm) SetHeaderCallback(f func(*object.Object)) {
+func (p *GetObjectPrm) SetHeaderCallback(f func(*objectSDK.Object)) {
 	p.headerCallback = f
 }
 
 // GetObjectRes groups the resulting values of GetObject operation.
 type GetObjectRes struct {
-	hdr *object.Object
+	hdr *objectSDK.Object
 }
 
 // Header returns the header of the request object.
-func (x GetObjectRes) Header() *object.Object {
+func (x GetObjectRes) Header() *objectSDK.Object {
 	return x.hdr
 }
 
@@ -585,7 +590,7 @@ func GetObject(ctx context.Context, prm GetObjectPrm) (*GetObjectRes, error) {
 		return nil, fmt.Errorf("init object reading on client: %w", err)
 	}
 
-	var hdr object.Object
+	var hdr objectSDK.Object
 
 	if !rdr.ReadHeader(&hdr) {
 		_, err = rdr.Close()
@@ -621,11 +626,11 @@ func (x *HeadObjectPrm) SetMainOnlyFlag(v bool) {
 
 // HeadObjectRes groups the resulting values of HeadObject operation.
 type HeadObjectRes struct {
-	hdr *object.Object
+	hdr *objectSDK.Object
 }
 
 // Header returns the requested object header.
-func (x HeadObjectRes) Header() *object.Object {
+func (x HeadObjectRes) Header() *objectSDK.Object {
 	return x.hdr
 }
 
@@ -661,7 +666,7 @@ func HeadObject(ctx context.Context, prm HeadObjectPrm) (*HeadObjectRes, error)
 		return nil, fmt.Errorf("read object header via client: %w", err)
 	}
 
-	var hdr object.Object
+	var hdr objectSDK.Object
 
 	if !res.ReadHeader(&hdr) {
 		return nil, fmt.Errorf("missing header in response")
@@ -677,11 +682,11 @@ type SearchObjectsPrm struct {
 	commonObjectPrm
 	containerIDPrm
 
-	filters object.SearchFilters
+	filters objectSDK.SearchFilters
 }
 
 // SetFilters sets search filters.
-func (x *SearchObjectsPrm) SetFilters(filters object.SearchFilters) {
+func (x *SearchObjectsPrm) SetFilters(filters objectSDK.SearchFilters) {
 	x.filters = filters
 }
 
@@ -754,7 +759,7 @@ type HashPayloadRangesPrm struct {
 
 	tz bool
 
-	rngs []*object.Range
+	rngs []*objectSDK.Range
 
 	salt []byte
 }
@@ -765,7 +770,7 @@ func (x *HashPayloadRangesPrm) TZ() {
 }
 
 // SetRanges sets a list of payload ranges to hash.
-func (x *HashPayloadRangesPrm) SetRanges(rngs []*object.Range) {
+func (x *HashPayloadRangesPrm) SetRanges(rngs []*objectSDK.Range) {
 	x.rngs = rngs
 }
 
@@ -839,11 +844,11 @@ type PayloadRangePrm struct {
 	rawPrm
 	payloadWriterPrm
 
-	rng *object.Range
+	rng *objectSDK.Range
 }
 
 // SetRange sets payload range to read.
-func (x *PayloadRangePrm) SetRange(rng *object.Range) {
+func (x *PayloadRangePrm) SetRange(rng *objectSDK.Range) {
 	x.rng = rng
 }
 

cmd/frostfs-cli/modules/bearer/create.go

@@ -24,6 +24,7 @@ const (
 	ownerFlag          = "owner"
 	outFlag            = "out"
 	jsonFlag           = commonflags.JSON
+	impersonateFlag    = "impersonate"
 )
 
 var createCmd = &cobra.Command{
@@ -39,19 +40,20 @@ is set to current epoch + n.
 }
 
 func init() {
-	createCmd.Flags().StringP(eaclFlag, "e", "", "Path to the extended ACL table")
-	createCmd.Flags().StringP(issuedAtFlag, "i", "", "Epoch to issue token at")
-	createCmd.Flags().StringP(notValidBeforeFlag, "n", "", "Not valid before epoch")
+	createCmd.Flags().StringP(eaclFlag, "e", "", "Path to the extended ACL table (mutually exclusive with --impersonate flag)")
+	createCmd.Flags().StringP(issuedAtFlag, "i", "+0", "Epoch to issue token at")
+	createCmd.Flags().StringP(notValidBeforeFlag, "n", "+0", "Not valid before epoch")
 	createCmd.Flags().StringP(commonflags.ExpireAt, "x", "", "The last active epoch for the token")
 	createCmd.Flags().StringP(ownerFlag, "o", "", "Token owner")
 	createCmd.Flags().String(outFlag, "", "File to write token to")
 	createCmd.Flags().Bool(jsonFlag, false, "Output token in JSON")
+	createCmd.Flags().Bool(impersonateFlag, false, "Mark token as impersonate to consider the token signer as the request owner (mutually exclusive with --eacl flag)")
 	createCmd.Flags().StringP(commonflags.RPC, commonflags.RPCShorthand, commonflags.RPCDefault, commonflags.RPCUsage)
 
+	createCmd.MarkFlagsMutuallyExclusive(eaclFlag, impersonateFlag)
+
 	_ = cobra.MarkFlagFilename(createCmd.Flags(), eaclFlag)
 
-	_ = cobra.MarkFlagRequired(createCmd.Flags(), issuedAtFlag)
-	_ = cobra.MarkFlagRequired(createCmd.Flags(), notValidBeforeFlag)
 	_ = cobra.MarkFlagRequired(createCmd.Flags(), commonflags.ExpireAt)
 	_ = cobra.MarkFlagRequired(createCmd.Flags(), ownerFlag)
 	_ = cobra.MarkFlagRequired(createCmd.Flags(), outFlag)
@@ -68,10 +70,14 @@ func createToken(cmd *cobra.Command, _ []string) {
 	commonCmd.ExitOnErr(cmd, "can't parse --"+notValidBeforeFlag+" flag: %w", err)
 
 	if iatRelative || expRelative || nvbRelative {
+		endpoint, _ := cmd.Flags().GetString(commonflags.RPC)
+		if len(endpoint) == 0 {
+			commonCmd.ExitOnErr(cmd, "can't fetch current epoch: %w", fmt.Errorf("'%s' flag value must be specified", commonflags.RPC))
+		}
+
 		ctx, cancel := context.WithTimeout(context.Background(), time.Second*30)
 		defer cancel()
 
-		endpoint, _ := cmd.Flags().GetString(commonflags.RPC)
 		currEpoch, err := internalclient.GetCurrentEpoch(ctx, cmd, endpoint)
 		commonCmd.ExitOnErr(cmd, "can't fetch current epoch: %w", err)
 
@@ -101,6 +107,9 @@ func createToken(cmd *cobra.Command, _ []string) {
 	b.SetIat(iat)
 	b.ForUser(ownerID)
 
+	impersonate, _ := cmd.Flags().GetBool(impersonateFlag)
+	b.SetImpersonate(impersonate)
+
 	eaclPath, _ := cmd.Flags().GetString(eaclFlag)
 	if eaclPath != "" {
 		table := eaclSDK.NewTable()

cmd/frostfs-cli/modules/container/create.go

@@ -13,6 +13,7 @@ import (
 	"git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags"
 	"git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/key"
 	commonCmd "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/internal/common"
+	"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client"
 	"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container"
 	"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/acl"
 	"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/netmap"
@@ -99,12 +100,12 @@ It will be stored in sidechain when inner ring will accepts it.`,
 		_, err = internalclient.SyncContainerSettings(cmd.Context(), syncContainerPrm)
 		commonCmd.ExitOnErr(cmd, "syncing container's settings rpc error: %w", err)
 
-		var putPrm internalclient.PutContainerPrm
-		putPrm.SetClient(cli)
-		putPrm.SetContainer(cnr)
-
-		if tok != nil {
-			putPrm.WithinSession(*tok)
+		putPrm := internalclient.PutContainerPrm{
+			Client: cli,
+			ClientParams: client.PrmContainerPut{
+				Container: &cnr,
+				Session:   tok,
+			},
 		}
 
 		res, err := internalclient.PutContainer(cmd.Context(), putPrm)
@@ -117,9 +118,12 @@ It will be stored in sidechain when inner ring will accepts it.`,
 		if containerAwait {
 			cmd.Println("awaiting...")
 
-			var getPrm internalclient.GetContainerPrm
-			getPrm.SetClient(cli)
-			getPrm.SetContainer(id)
+			getPrm := internalclient.GetContainerPrm{
+				Client: cli,
+				ClientParams: client.PrmContainerGet{
+					ContainerID: &id,
+				},
+			}
 
 			for i := 0; i < awaitTimeout; i++ {
 				time.Sleep(1 * time.Second)

cmd/frostfs-cli/modules/container/delete.go

@@ -9,6 +9,7 @@ import (
 	"git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags"
 	"git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/key"
 	commonCmd "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/internal/common"
+	"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client"
 	objectSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object"
 	"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/user"
 	"github.com/spf13/cobra"
@@ -30,9 +31,12 @@ Only owner of the container has a permission to remove container.`,
 		if force, _ := cmd.Flags().GetBool(commonflags.ForceFlag); !force {
 			common.PrintVerbose(cmd, "Reading the container to check ownership...")
 
-			var getPrm internalclient.GetContainerPrm
-			getPrm.SetClient(cli)
-			getPrm.SetContainer(id)
+			getPrm := internalclient.GetContainerPrm{
+				Client: cli,
+				ClientParams: client.PrmContainerGet{
+					ContainerID: &id,
+				},
+			}
 
 			resGet, err := internalclient.GetContainer(cmd.Context(), getPrm)
 			commonCmd.ExitOnErr(cmd, "can't get the container: %w", err)
@@ -83,12 +87,12 @@ Only owner of the container has a permission to remove container.`,
 			}
 		}
 
-		var delPrm internalclient.DeleteContainerPrm
-		delPrm.SetClient(cli)
-		delPrm.SetContainer(id)
-
-		if tok != nil {
-			delPrm.WithinSession(*tok)
+		delPrm := internalclient.DeleteContainerPrm{
+			Client: cli,
+			ClientParams: client.PrmContainerDelete{
+				ContainerID: &id,
+				Session:     tok,
+			},
 		}
 
 		_, err := internalclient.DeleteContainer(cmd.Context(), delPrm)
@@ -99,9 +103,12 @@ Only owner of the container has a permission to remove container.`,
 		if containerAwait {
 			cmd.Println("awaiting...")
 
-			var getPrm internalclient.GetContainerPrm
-			getPrm.SetClient(cli)
-			getPrm.SetContainer(id)
+			getPrm := internalclient.GetContainerPrm{
+				Client: cli,
+				ClientParams: client.PrmContainerGet{
+					ContainerID: &id,
+				},
+			}
 
 			for i := 0; i < awaitTimeout; i++ {
 				time.Sleep(1 * time.Second)

cmd/frostfs-cli/modules/container/get.go

@@ -10,6 +10,7 @@ import (
 	"git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/key"
 	"git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/modules/util"
 	commonCmd "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/internal/common"
+	"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client"
 	"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container"
 	"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/acl"
 	cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id"
@@ -147,9 +148,12 @@ func getContainer(cmd *cobra.Command) (container.Container, *ecdsa.PrivateKey) {
 		pk = key.GetOrGenerate(cmd)
 		cli := internalclient.GetSDKClientByFlag(cmd, pk, commonflags.RPC)
 
-		var prm internalclient.GetContainerPrm
-		prm.SetClient(cli)
-		prm.SetContainer(id)
+		prm := internalclient.GetContainerPrm{
+			Client: cli,
+			ClientParams: client.PrmContainerGet{
+				ContainerID: &id,
+			},
+		}
 
 		res, err := internalclient.GetContainer(cmd.Context(), prm)
 		commonCmd.ExitOnErr(cmd, "rpc error: %w", err)

cmd/frostfs-cli/modules/container/list.go

@@ -52,8 +52,9 @@ var listContainersCmd = &cobra.Command{
 		res, err := internalclient.ListContainers(cmd.Context(), prm)
 		commonCmd.ExitOnErr(cmd, "rpc error: %w", err)
 
-		var prmGet internalclient.GetContainerPrm
-		prmGet.SetClient(cli)
+		prmGet := internalclient.GetContainerPrm{
+			Client: cli,
+		}
 
 		containerIDs := res.IDList()
 		for _, cnrID := range containerIDs {
@@ -62,7 +63,8 @@ var listContainersCmd = &cobra.Command{
 				continue
 			}
 
-			prmGet.SetContainer(cnrID)
+			cnrID := cnrID
+			prmGet.ClientParams.ContainerID = &cnrID
 			res, err := internalclient.GetContainer(cmd.Context(), prmGet)
 			if err != nil {
 				cmd.Printf("  failed to read attributes: %v\n", err)

cmd/frostfs-cli/modules/container/list_objects.go

@@ -9,7 +9,7 @@ import (
 	"git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/key"
 	objectCli "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/modules/object"
 	commonCmd "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/internal/common"
-	"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object"
+	objectSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object"
 	oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id"
 	"github.com/spf13/cobra"
 )
@@ -31,7 +31,7 @@ var listContainerObjectsCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		id := parseContainerID(cmd)
 
-		filters := new(object.SearchFilters)
+		filters := new(objectSDK.SearchFilters)
 		filters.AddRootFilter() // search only user created objects
 
 		cli := internalclient.GetSDKClientByFlag(cmd, key.GetOrGenerate(cmd), commonflags.RPC)

cmd/frostfs-cli/modules/container/policy_playground.go

@@ -3,6 +3,7 @@ package container
 import (
 	"bufio"
 	"encoding/hex"
+	"encoding/json"
 	"fmt"
 	"io"
 	"os"
@@ -39,7 +40,7 @@ func (repl *policyPlaygroundREPL) handleLs(args []string) error {
 	for id, node := range repl.nodes {
 		var attrs []string
 		node.IterateAttributes(func(k, v string) {
-			attrs = append(attrs, fmt.Sprintf("%s:%s", k, v))
+			attrs = append(attrs, fmt.Sprintf("%s:%q", k, v))
 		})
 		fmt.Printf("\t%2d: id=%s attrs={%v}\n", i, id, strings.Join(attrs, " "))
 		i++
@@ -69,6 +70,40 @@ func (repl *policyPlaygroundREPL) handleAdd(args []string) error {
 	return nil
 }
 
+func (repl *policyPlaygroundREPL) handleLoad(args []string) error {
+	if len(args) != 1 {
+		return fmt.Errorf("too few arguments for command 'add': got %d, want 1", len(args))
+	}
+
+	jsonNetmap := map[string]map[string]string{}
+
+	b, err := os.ReadFile(args[0])
+	if err != nil {
+		return fmt.Errorf("reading netmap file %q: %v", args[0], err)
+	}
+
+	if err := json.Unmarshal(b, &jsonNetmap); err != nil {
+		return fmt.Errorf("decoding json netmap: %v", err)
+	}
+
+	repl.nodes = make(map[string]netmap.NodeInfo)
+	for id, attrs := range jsonNetmap {
+		key, err := hex.DecodeString(id)
+		if err != nil {
+			return fmt.Errorf("node id must be a hex string: got %q: %v", id, err)
+		}
+
+		node := repl.nodes[id]
+		node.SetPublicKey(key)
+		for k, v := range attrs {
+			node.SetAttribute(k, v)
+		}
+		repl.nodes[id] = node
+	}
+
+	return nil
+}
+
 func (repl *policyPlaygroundREPL) handleRemove(args []string) error {
 	if len(args) == 0 {
 		return fmt.Errorf("too few arguments for command 'remove': got %d, want >0", len(args))
@@ -82,16 +117,33 @@ func (repl *policyPlaygroundREPL) handleRemove(args []string) error {
 }
 
 func (repl *policyPlaygroundREPL) handleEval(args []string) error {
-	policyStr := strings.Join(args, " ")
+	policyStr := strings.TrimSpace(strings.Join(args, " "))
+	var nodes [][]netmap.NodeInfo
+	nm := repl.netMap()
+
+	if strings.HasPrefix(policyStr, "CBF") || strings.HasPrefix(policyStr, "SELECT") || strings.HasPrefix(policyStr, "FILTER") {
+		// Assume that the input is a partial SELECT-FILTER expression.
+		// Full inline policies always start with UNIQUE or REP keywords,
+		// or different prefixes when it's the case of an external file.
+		sfExpr, err := netmap.DecodeSelectFilterString(policyStr)
+		if err != nil {
+			return fmt.Errorf("parsing select-filter expression: %v", err)
+		}
+		nodes, err = nm.SelectFilterNodes(sfExpr)
+		if err != nil {
+			return fmt.Errorf("building select-filter nodes: %v", err)
+		}
+	} else {
+		// Assume that the input is a full policy or input file otherwise.
 		placementPolicy, err := parseContainerPolicy(repl.cmd, policyStr)
 		if err != nil {
 			return fmt.Errorf("parsing placement policy: %v", err)
 		}
-	nm := repl.netMap()
-	nodes, err := nm.ContainerNodes(*placementPolicy, nil)
+		nodes, err = nm.ContainerNodes(*placementPolicy, nil)
 		if err != nil {
 			return fmt.Errorf("building container nodes: %v", err)
 		}
+	}
 	for i, ns := range nodes {
 		var ids []string
 		for _, node := range ns {
@@ -131,9 +183,12 @@ func (repl *policyPlaygroundREPL) run() error {
 	}
 
 	cmdHandlers := map[string]func([]string) error{
+		"list":   repl.handleLs,
 		"ls":     repl.handleLs,
 		"add":    repl.handleAdd,
+		"load":   repl.handleLoad,
 		"remove": repl.handleRemove,
+		"rm":     repl.handleRemove,
 		"eval":   repl.handleEval,
 	}
 	for reader := bufio.NewReader(os.Stdin); ; {

cmd/frostfs-cli/modules/control/shards.go

@@ -13,6 +13,7 @@ var shardsCmd = &cobra.Command{
 func initControlShardsCmd() {
 	shardsCmd.AddCommand(listShardsCmd)
 	shardsCmd.AddCommand(setShardModeCmd)
+	shardsCmd.AddCommand(evacuateShardCmd)
 	shardsCmd.AddCommand(evacuationShardCmd)
 	shardsCmd.AddCommand(flushCacheCmd)
 	shardsCmd.AddCommand(doctorCmd)

cmd/frostfs-cli/modules/netmap/netinfo.go

@@ -38,8 +38,6 @@ var netInfoCmd = &cobra.Command{
 		const format = "  %s: %v\n"
 
 		cmd.Println("FrostFS network configuration (system)")
-		cmd.Printf(format, "Audit fee", netInfo.AuditFee())
-		cmd.Printf(format, "Storage price", netInfo.StoragePrice())
 		cmd.Printf(format, "Container fee", netInfo.ContainerFee())
 		cmd.Printf(format, "Epoch duration", netInfo.EpochDuration())
 		cmd.Printf(format, "Inner Ring candidate fee", netInfo.IRCandidateFee())

cmd/frostfs-cli/modules/object/get.go

@@ -11,7 +11,7 @@ import (
 	"git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/key"
 	commonCmd "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/internal/common"
 	cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id"
-	"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object"
+	objectSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object"
 	oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id"
 	"github.com/cheggaaa/pb"
 	"github.com/spf13/cobra"
@@ -84,7 +84,7 @@ func getObject(cmd *cobra.Command, _ []string) {
 		p = pb.New64(0)
 		p.Output = cmd.OutOrStdout()
 		prm.SetPayloadWriter(p.NewProxyWriter(payloadWriter))
-		prm.SetHeaderCallback(func(o *object.Object) {
+		prm.SetHeaderCallback(func(o *objectSDK.Object) {
 			p.SetTotal64(int64(o.PayloadSize()))
 			p.Start()
 		})

cmd/frostfs-cli/modules/object/head.go

@@ -13,7 +13,7 @@ import (
 	"git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/key"
 	commonCmd "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/internal/common"
 	cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id"
-	"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object"
+	objectSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object"
 	oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id"
 	"github.com/spf13/cobra"
 )
@@ -77,7 +77,7 @@ func getObjectHeader(cmd *cobra.Command, _ []string) {
 	commonCmd.ExitOnErr(cmd, "", err)
 }
 
-func saveAndPrintHeader(cmd *cobra.Command, obj *object.Object, filename string) error {
+func saveAndPrintHeader(cmd *cobra.Command, obj *objectSDK.Object, filename string) error {
 	bs, err := marshalHeader(cmd, obj)
 	if err != nil {
 		return fmt.Errorf("could not marshal header: %w", err)
@@ -97,7 +97,7 @@ func saveAndPrintHeader(cmd *cobra.Command, obj *object.Object, filename string)
 	return printHeader(cmd, obj)
 }
 
-func marshalHeader(cmd *cobra.Command, hdr *object.Object) ([]byte, error) {
+func marshalHeader(cmd *cobra.Command, hdr *objectSDK.Object) ([]byte, error) {
 	toJSON, _ := cmd.Flags().GetBool(commonflags.JSON)
 	toProto, _ := cmd.Flags().GetBool("proto")
 	switch {
@@ -138,7 +138,7 @@ func printContainerID(cmd *cobra.Command, recv func() (cid.ID, bool)) {
 	cmd.Printf("CID: %s\n", strID)
 }
 
-func printHeader(cmd *cobra.Command, obj *object.Object) error {
+func printHeader(cmd *cobra.Command, obj *objectSDK.Object) error {
 	printObjectID(cmd, obj.ID)
 	printContainerID(cmd, obj.ContainerID)
 	cmd.Printf("Owner: %s\n", obj.OwnerID())
@@ -150,7 +150,7 @@ func printHeader(cmd *cobra.Command, obj *object.Object) error {
 
 	cmd.Println("Attributes:")
 	for _, attr := range obj.Attributes() {
-		if attr.Key() == object.AttributeTimestamp {
+		if attr.Key() == objectSDK.AttributeTimestamp {
 			cmd.Printf("  %s=%s (%s)\n",
 				attr.Key(),
 				attr.Value(),
@@ -174,7 +174,7 @@ func printHeader(cmd *cobra.Command, obj *object.Object) error {
 	return printSplitHeader(cmd, obj)
 }
 
-func printSplitHeader(cmd *cobra.Command, obj *object.Object) error {
+func printSplitHeader(cmd *cobra.Command, obj *objectSDK.Object) error {
 	if splitID := obj.SplitID(); splitID != nil {
 		cmd.Printf("Split ID: %s\n", splitID)
 	}

cmd/frostfs-cli/modules/object/nodes.go

@@ -3,6 +3,7 @@ package object
 import (
 	"context"
 	"crypto/ecdsa"
+	"encoding/hex"
 	"errors"
 	"fmt"
 	"strconv"
@@ -154,9 +155,12 @@ func getPlacementPolicyAndNetmap(cmd *cobra.Command, cnrID cid.ID, cli *client.C
 }
 
 func getPlacementPolicy(ctx context.Context, cnrID cid.ID, cli *client.Client) (netmapSDK.PlacementPolicy, error) {
-	var prm internalclient.GetContainerPrm
-	prm.SetClient(cli)
-	prm.SetContainer(cnrID)
+	prm := internalclient.GetContainerPrm{
+		Client: cli,
+		ClientParams: client.PrmContainerGet{
+			ContainerID: &cnrID,
+		},
+	}
 
 	res, err := internalclient.GetContainer(ctx, prm)
 	if err != nil {
@@ -223,14 +227,12 @@ func getActualPlacement(cmd *cobra.Command, netmap *netmapSDK.NetMap, requiredPl
 		}
 	}
 
-	var err error
 	eg, egCtx := errgroup.WithContext(cmd.Context())
 	for _, cand := range candidates {
 		cand := cand
 
 		eg.Go(func() error {
-			var cli *client.Client
-			cli, err = createClient(egCtx, cmd, cand, pk)
+			cli, err := createClient(egCtx, cmd, cand, pk)
 			if err != nil {
 				resultMtx.Lock()
 				defer resultMtx.Unlock()
@@ -268,13 +270,7 @@ func getActualPlacement(cmd *cobra.Command, netmap *netmapSDK.NetMap, requiredPl
 		})
 	}
 
-	egErr := eg.Wait()
-	if err != nil || egErr != nil {
-		if err == nil {
-			err = egErr
-		}
-		commonCmd.ExitOnErr(cmd, "failed to get actual placement: %w", err)
-	}
+	commonCmd.ExitOnErr(cmd, "failed to get actual placement: %w", eg.Wait())
 	return result
 }
 
@@ -285,6 +281,7 @@ func createClient(ctx context.Context, cmd *cobra.Command, candidate netmapSDK.N
 		addresses = append(addresses, s)
 		return false
 	})
+	addresses = append(addresses, candidate.ExternalAddresses()...)
 	var lastErr error
 	for _, address := range addresses {
 		var networkAddr network.Address
@@ -336,13 +333,9 @@ func printPlacement(cmd *cobra.Command, netmap *netmapSDK.NetMap, requiredPlacem
 	defer func() {
 		commonCmd.ExitOnErr(cmd, "failed to print placement info: %w", w.Flush())
 	}()
-	fmt.Fprintln(w, "Netmap node\tShould contain object\tActually contains object\t")
+	fmt.Fprintln(w, "Node ID\tShould contain object\tActually contains object\t")
 	for _, n := range netmap.Nodes() {
-		var address string
-		n.IterateNetworkEndpoints(func(s string) bool {
-			address = s
-			return s != ""
-		})
+		nodeID := hex.EncodeToString(n.PublicKey())
 		_, required := requiredPlacement[n.Hash()]
 		actual, actualExists := actualPlacement[n.Hash()]
 		actualStr := ""
@@ -353,6 +346,6 @@ func printPlacement(cmd *cobra.Command, netmap *netmapSDK.NetMap, requiredPlacem
 				actualStr = strconv.FormatBool(actual.value)
 			}
 		}
-		fmt.Fprintf(w, "%s\t%s\t%s\t\n", address, strconv.FormatBool(required), actualStr)
+		fmt.Fprintf(w, "%s\t%s\t%s\t\n", nodeID, strconv.FormatBool(required), actualStr)
 	}
 }

cmd/frostfs-cli/modules/object/put.go

@@ -16,7 +16,7 @@ import (
 	"git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/key"
 	commonCmd "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/internal/common"
 	cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id"
-	"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object"
+	objectSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object"
 	"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/user"
 	"github.com/cheggaaa/pb"
 	"github.com/spf13/cobra"
@@ -81,7 +81,7 @@ func putObject(cmd *cobra.Command, _ []string) {
 		commonCmd.ExitOnErr(cmd, "", fmt.Errorf("can't open file '%s': %w", filename, err))
 	}
 	var payloadReader io.Reader = f
-	obj := object.New()
+	obj := objectSDK.New()
 
 	if binary {
 		payloadReader, cnr, ownerID = readFilePayload(filename, cmd)
@@ -155,7 +155,7 @@ func parseCopyNumber(cmd *cobra.Command, copyNum string) []uint32 {
 func readFilePayload(filename string, cmd *cobra.Command) (io.Reader, cid.ID, user.ID) {
 	buf, err := os.ReadFile(filename)
 	commonCmd.ExitOnErr(cmd, "unable to read given file: %w", err)
-	objTemp := object.New()
+	objTemp := objectSDK.New()
 	// TODO(@acid-ant): #1932 Use streams to marshal/unmarshal payload
 	commonCmd.ExitOnErr(cmd, "can't unmarshal object from given file: %w", objTemp.Unmarshal(buf))
 	payloadReader := bytes.NewReader(objTemp.Payload())
@@ -174,19 +174,19 @@ func setFilePayloadReader(cmd *cobra.Command, f *os.File, prm *internalclient.Pu
 	p := pb.New64(fi.Size())
 	p.Output = cmd.OutOrStdout()
 	prm.SetPayloadReader(p.NewProxyReader(f))
-	prm.SetHeaderCallback(func(o *object.Object) { p.Start() })
+	prm.SetHeaderCallback(func(o *objectSDK.Object) { p.Start() })
 	return p
 }
 
-func setBinaryPayloadReader(cmd *cobra.Command, obj *object.Object, prm *internalclient.PutObjectPrm, payloadReader io.Reader) *pb.ProgressBar {
+func setBinaryPayloadReader(cmd *cobra.Command, obj *objectSDK.Object, prm *internalclient.PutObjectPrm, payloadReader io.Reader) *pb.ProgressBar {
 	p := pb.New(len(obj.Payload()))
 	p.Output = cmd.OutOrStdout()
 	prm.SetPayloadReader(p.NewProxyReader(payloadReader))
-	prm.SetHeaderCallback(func(o *object.Object) { p.Start() })
+	prm.SetHeaderCallback(func(o *objectSDK.Object) { p.Start() })
 	return p
 }
 
-func getAllObjectAttributes(cmd *cobra.Command) []object.Attribute {
+func getAllObjectAttributes(cmd *cobra.Command) []objectSDK.Attribute {
 	attrs, err := parseObjectAttrs(cmd)
 	commonCmd.ExitOnErr(cmd, "can't parse object attributes: %w", err)
 
@@ -205,7 +205,7 @@ func getAllObjectAttributes(cmd *cobra.Command) []object.Attribute {
 
 		if !expAttrFound {
 			index := len(attrs)
-			attrs = append(attrs, object.Attribute{})
+			attrs = append(attrs, objectSDK.Attribute{})
 			attrs[index].SetKey(objectV2.SysAttributeExpEpoch)
 			attrs[index].SetValue(expAttrValue)
 		}
@@ -213,7 +213,7 @@ func getAllObjectAttributes(cmd *cobra.Command) []object.Attribute {
 	return attrs
 }
 
-func parseObjectAttrs(cmd *cobra.Command) ([]object.Attribute, error) {
+func parseObjectAttrs(cmd *cobra.Command) ([]objectSDK.Attribute, error) {
 	var rawAttrs []string
 
 	raw := cmd.Flag("attributes").Value.String()
@@ -221,7 +221,7 @@ func parseObjectAttrs(cmd *cobra.Command) ([]object.Attribute, error) {
 		rawAttrs = strings.Split(raw, ",")
 	}
 
-	attrs := make([]object.Attribute, len(rawAttrs), len(rawAttrs)+2) // name + timestamp attributes
+	attrs := make([]objectSDK.Attribute, len(rawAttrs), len(rawAttrs)+2) // name + timestamp attributes
 	for i := range rawAttrs {
 		k, v, found := strings.Cut(rawAttrs[i], "=")
 		if !found {
@@ -235,23 +235,23 @@ func parseObjectAttrs(cmd *cobra.Command) ([]object.Attribute, error) {
 	if !disableFilename {
 		filename := filepath.Base(cmd.Flag(fileFlag).Value.String())
 		index := len(attrs)
-		attrs = append(attrs, object.Attribute{})
-		attrs[index].SetKey(object.AttributeFileName)
+		attrs = append(attrs, objectSDK.Attribute{})
+		attrs[index].SetKey(objectSDK.AttributeFileName)
 		attrs[index].SetValue(filename)
 	}
 
 	disableTime, _ := cmd.Flags().GetBool("disable-timestamp")
 	if !disableTime {
 		index := len(attrs)
-		attrs = append(attrs, object.Attribute{})
-		attrs[index].SetKey(object.AttributeTimestamp)
+		attrs = append(attrs, objectSDK.Attribute{})
+		attrs[index].SetKey(objectSDK.AttributeTimestamp)
 		attrs[index].SetValue(strconv.FormatInt(time.Now().Unix(), 10))
 	}
 
 	return attrs, nil
 }
 
-func parseObjectNotifications(cmd *cobra.Command) (*object.NotificationInfo, error) {
+func parseObjectNotifications(cmd *cobra.Command) (*objectSDK.NotificationInfo, error) {
 	const (
 		separator       = ":"
 		useDefaultTopic = "-"
@@ -267,7 +267,7 @@ func parseObjectNotifications(cmd *cobra.Command) (*object.NotificationInfo, err
 		return nil, fmt.Errorf("notification must be in the form of: *epoch*%s*topic*, got %s", separator, raw)
 	}
 
-	ni := new(object.NotificationInfo)
+	ni := new(objectSDK.NotificationInfo)
 
 	epoch, err := strconv.ParseUint(before, 10, 64)
 	if err != nil {

cmd/frostfs-cli/modules/object/range.go

@@ -14,7 +14,7 @@ import (
 	"git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/key"
 	commonCmd "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/internal/common"
 	cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id"
-	"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object"
+	objectSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object"
 	oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id"
 	"github.com/spf13/cobra"
 )
@@ -102,7 +102,7 @@ func getObjectRange(cmd *cobra.Command, _ []string) {
 }
 
 func printSplitInfoErr(cmd *cobra.Command, err error) bool {
-	var errSplitInfo *object.SplitInfoError
+	var errSplitInfo *objectSDK.SplitInfoError
 
 	ok := errors.As(err, &errSplitInfo)
 
@@ -114,14 +114,14 @@ func printSplitInfoErr(cmd *cobra.Command, err error) bool {
 	return ok
 }
 
-func printSplitInfo(cmd *cobra.Command, info *object.SplitInfo) {
+func printSplitInfo(cmd *cobra.Command, info *objectSDK.SplitInfo) {
 	bs, err := marshalSplitInfo(cmd, info)
 	commonCmd.ExitOnErr(cmd, "can't marshal split info: %w", err)
 
 	cmd.Println(string(bs))
 }
 
-func marshalSplitInfo(cmd *cobra.Command, info *object.SplitInfo) ([]byte, error) {
+func marshalSplitInfo(cmd *cobra.Command, info *objectSDK.SplitInfo) ([]byte, error) {
 	toJSON, _ := cmd.Flags().GetBool(commonflags.JSON)
 	toProto, _ := cmd.Flags().GetBool("proto")
 	switch {
@@ -146,13 +146,13 @@ func marshalSplitInfo(cmd *cobra.Command, info *object.SplitInfo) ([]byte, error
 	}
 }
 
-func getRangeList(cmd *cobra.Command) ([]*object.Range, error) {
+func getRangeList(cmd *cobra.Command) ([]*objectSDK.Range, error) {
 	v := cmd.Flag("range").Value.String()
 	if len(v) == 0 {
 		return nil, nil
 	}
 	vs := strings.Split(v, ",")
-	rs := make([]*object.Range, len(vs))
+	rs := make([]*objectSDK.Range, len(vs))
 	for i := range vs {
 		before, after, found := strings.Cut(vs[i], rangeSep)
 		if !found {
@@ -176,7 +176,7 @@ func getRangeList(cmd *cobra.Command) ([]*object.Range, error) {
 			return nil, fmt.Errorf("invalid '%s' range: uint64 overflow", vs[i])
 		}
 
-		rs[i] = object.NewRange()
+		rs[i] = objectSDK.NewRange()
 		rs[i].SetOffset(offset)
 		rs[i].SetLength(length)
 	}

cmd/frostfs-cli/modules/object/search.go

@@ -10,7 +10,7 @@ import (
 	"git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/key"
 	commonCmd "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/internal/common"
 	cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id"
-	"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object"
+	objectSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object"
 	oidSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id"
 	"github.com/spf13/cobra"
 )
@@ -72,18 +72,18 @@ func searchObject(cmd *cobra.Command, _ []string) {
 	}
 }
 
-var searchUnaryOpVocabulary = map[string]object.SearchMatchType{
-	"NOPRESENT": object.MatchNotPresent,
+var searchUnaryOpVocabulary = map[string]objectSDK.SearchMatchType{
+	"NOPRESENT": objectSDK.MatchNotPresent,
 }
 
-var searchBinaryOpVocabulary = map[string]object.SearchMatchType{
-	"EQ":            object.MatchStringEqual,
-	"NE":            object.MatchStringNotEqual,
-	"COMMON_PREFIX": object.MatchCommonPrefix,
+var searchBinaryOpVocabulary = map[string]objectSDK.SearchMatchType{
+	"EQ":            objectSDK.MatchStringEqual,
+	"NE":            objectSDK.MatchStringNotEqual,
+	"COMMON_PREFIX": objectSDK.MatchCommonPrefix,
 }
 
-func parseSearchFilters(cmd *cobra.Command) (object.SearchFilters, error) {
-	var fs object.SearchFilters
+func parseSearchFilters(cmd *cobra.Command) (objectSDK.SearchFilters, error) {
+	var fs objectSDK.SearchFilters
 
 	for i := range searchFilters {
 		words := strings.Fields(searchFilters[i])
@@ -97,7 +97,7 @@ func parseSearchFilters(cmd *cobra.Command) (object.SearchFilters, error) {
 				return nil, fmt.Errorf("could not read attributes filter from file: %w", err)
 			}
 
-			subFs := object.NewSearchFilters()
+			subFs := objectSDK.NewSearchFilters()
 
 			if err := subFs.UnmarshalJSON(data); err != nil {
 				return nil, fmt.Errorf("could not unmarshal attributes filter from file: %w", err)
@@ -138,7 +138,7 @@ func parseSearchFilters(cmd *cobra.Command) (object.SearchFilters, error) {
 			return nil, fmt.Errorf("could not parse object ID: %w", err)
 		}
 
-		fs.AddObjectIDFilter(object.MatchStringEqual, id)
+		fs.AddObjectIDFilter(objectSDK.MatchStringEqual, id)
 	}
 
 	return fs, nil

cmd/frostfs-cli/modules/object/util.go

@@ -16,7 +16,7 @@ import (
 	"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client"
 	cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id"
 	frostfsecdsa "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/crypto/ecdsa"
-	"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object"
+	objectSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object"
 	oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id"
 	"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/session"
 	"github.com/spf13/cobra"
@@ -87,7 +87,7 @@ func readObjectAddress(cmd *cobra.Command, cnr *cid.ID, obj *oid.ID) oid.Address
 func readObjectAddressBin(cmd *cobra.Command, cnr *cid.ID, obj *oid.ID, filename string) oid.Address {
 	buf, err := os.ReadFile(filename)
 	commonCmd.ExitOnErr(cmd, "unable to read given file: %w", err)
-	objTemp := object.New()
+	objTemp := objectSDK.New()
 	commonCmd.ExitOnErr(cmd, "can't unmarshal object from given file: %w", objTemp.Unmarshal(buf))
 
 	var addr oid.Address
@@ -356,7 +356,7 @@ func collectObjectRelatives(cmd *cobra.Command, cli *client.Client, cnr cid.ID,
 
 	_, err := internal.HeadObject(cmd.Context(), prmHead)
 
-	var errSplit *object.SplitInfoError
+	var errSplit *objectSDK.SplitInfoError
 
 	switch {
 	default:
@@ -381,7 +381,7 @@ func collectObjectRelatives(cmd *cobra.Command, cli *client.Client, cnr cid.ID,
 	return tryRestoreChainInReverse(cmd, splitInfo, prmHead, cli, cnr, obj)
 }
 
-func tryGetSplitMembersByLinkingObject(cmd *cobra.Command, splitInfo *object.SplitInfo, prmHead internal.HeadObjectPrm, cnr cid.ID) ([]oid.ID, bool) {
+func tryGetSplitMembersByLinkingObject(cmd *cobra.Command, splitInfo *objectSDK.SplitInfo, prmHead internal.HeadObjectPrm, cnr cid.ID) ([]oid.ID, bool) {
 	// collect split chain by the descending ease of operations (ease is evaluated heuristically).
 	// If any approach fails, we don't try the next since we assume that it will fail too.
 
@@ -413,12 +413,12 @@ func tryGetSplitMembersByLinkingObject(cmd *cobra.Command, splitInfo *object.Spl
 	return nil, false
 }
 
-func tryGetSplitMembersBySplitID(cmd *cobra.Command, splitInfo *object.SplitInfo, cli *client.Client, cnr cid.ID) ([]oid.ID, bool) {
+func tryGetSplitMembersBySplitID(cmd *cobra.Command, splitInfo *objectSDK.SplitInfo, cli *client.Client, cnr cid.ID) ([]oid.ID, bool) {
 	if idSplit := splitInfo.SplitID(); idSplit != nil {
 		common.PrintVerbose(cmd, "Collecting split members by split ID...")
 
-		var query object.SearchFilters
-		query.AddSplitIDFilter(object.MatchStringEqual, idSplit)
+		var query objectSDK.SearchFilters
+		query.AddSplitIDFilter(objectSDK.MatchStringEqual, idSplit)
 
 		var prm internal.SearchObjectsPrm
 		prm.SetContainerID(cnr)
@@ -437,7 +437,7 @@ func tryGetSplitMembersBySplitID(cmd *cobra.Command, splitInfo *object.SplitInfo
 	return nil, false
 }
 
-func tryRestoreChainInReverse(cmd *cobra.Command, splitInfo *object.SplitInfo, prmHead internal.HeadObjectPrm, cli *client.Client, cnr cid.ID, obj oid.ID) []oid.ID {
+func tryRestoreChainInReverse(cmd *cobra.Command, splitInfo *objectSDK.SplitInfo, prmHead internal.HeadObjectPrm, cli *client.Client, cnr cid.ID, obj oid.ID) []oid.ID {
 	var addrObj oid.Address
 	addrObj.SetContainer(cnr)
 
@@ -482,8 +482,8 @@ func tryRestoreChainInReverse(cmd *cobra.Command, splitInfo *object.SplitInfo, p
 
 	common.PrintVerbose(cmd, "Looking for a linking object...")
 
-	var query object.SearchFilters
-	query.AddParentIDFilter(object.MatchStringEqual, obj)
+	var query objectSDK.SearchFilters
+	query.AddParentIDFilter(objectSDK.MatchStringEqual, obj)
 
 	var prmSearch internal.SearchObjectsPrm
 	prmSearch.SetClient(cli)

cmd/frostfs-cli/modules/root.go

@@ -85,7 +85,7 @@ func init() {
 	rootCmd.AddCommand(objectCli.Cmd)
 	rootCmd.AddCommand(containerCli.Cmd)
 	rootCmd.AddCommand(tree.Cmd)
-	rootCmd.AddCommand(gendoc.Command(rootCmd))
+	rootCmd.AddCommand(gendoc.Command(rootCmd, gendoc.Options{}))
 }
 
 func entryPoint(cmd *cobra.Command, _ []string) {

cmd/frostfs-cli/modules/tree/add.go

@@ -50,24 +50,29 @@ func add(cmd *cobra.Command, _ []string) {
 	ctx := cmd.Context()
 
 	cli, err := _client(ctx)
-	commonCmd.ExitOnErr(cmd, "client: %w", err)
+	commonCmd.ExitOnErr(cmd, "failed to create client: %w", err)
 
 	rawCID := make([]byte, sha256.Size)
 	cnr.Encode(rawCID)
 
+	var bt []byte
+	if t := common.ReadBearerToken(cmd, bearerFlagKey); t != nil {
+		bt = t.Marshal()
+	}
+
 	req := new(tree.AddRequest)
 	req.Body = &tree.AddRequest_Body{
 		ContainerId: rawCID,
 		TreeId:      tid,
 		ParentId:    pid,
 		Meta:        meta,
-		BearerToken: common.ReadBearerToken(cmd, bearerFlagKey).Marshal(),
+		BearerToken: bt,
 	}
 
-	commonCmd.ExitOnErr(cmd, "message signing: %w", tree.SignMessage(req, pk))
+	commonCmd.ExitOnErr(cmd, "signing message: %w", tree.SignMessage(req, pk))
 
 	resp, err := cli.Add(ctx, req)
-	commonCmd.ExitOnErr(cmd, "rpc call: %w", err)
+	commonCmd.ExitOnErr(cmd, "failed to cal add: %w", err)
 
 	cmd.Println("Node ID: ", resp.Body.NodeId)
 }

cmd/frostfs-cli/modules/tree/add_by_path.go

@@ -10,7 +10,7 @@ import (
 	commonCmd "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/internal/common"
 	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/tree"
 	cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id"
-	"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object"
+	objectSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object"
 	"github.com/spf13/cobra"
 )
 
@@ -53,7 +53,7 @@ func addByPath(cmd *cobra.Command, _ []string) {
 	ctx := cmd.Context()
 
 	cli, err := _client(ctx)
-	commonCmd.ExitOnErr(cmd, "client: %w", err)
+	commonCmd.ExitOnErr(cmd, "failed to create client: %w", err)
 
 	rawCID := make([]byte, sha256.Size)
 	cnr.Encode(rawCID)
@@ -62,23 +62,27 @@ func addByPath(cmd *cobra.Command, _ []string) {
 	commonCmd.ExitOnErr(cmd, "meta data parsing: %w", err)
 
 	path, _ := cmd.Flags().GetString(pathFlagKey)
-	// pAttr, _ := cmd.Flags().GetString(pathAttributeFlagKey)
+
+	var bt []byte
+	if t := common.ReadBearerToken(cmd, bearerFlagKey); t != nil {
+		bt = t.Marshal()
+	}
 
 	req := new(tree.AddByPathRequest)
 	req.Body = &tree.AddByPathRequest_Body{
 		ContainerId:   rawCID,
 		TreeId:        tid,
-		PathAttribute: object.AttributeFileName,
+		PathAttribute: objectSDK.AttributeFileName,
 		// PathAttribute: pAttr,
 		Path:        strings.Split(path, "/"),
 		Meta:        meta,
-		BearerToken: common.ReadBearerToken(cmd, bearerFlagKey).Marshal(),
+		BearerToken: bt,
 	}
 
-	commonCmd.ExitOnErr(cmd, "message signing: %w", tree.SignMessage(req, pk))
+	commonCmd.ExitOnErr(cmd, "signing message: %w", tree.SignMessage(req, pk))
 
 	resp, err := cli.AddByPath(ctx, req)
-	commonCmd.ExitOnErr(cmd, "rpc call: %w", err)
+	commonCmd.ExitOnErr(cmd, "failed to addByPath %w", err)
 
 	cmd.Printf("Parent ID: %d\n", resp.GetBody().GetParentId())
 

cmd/frostfs-cli/modules/tree/get_by_path.go

@@ -10,7 +10,7 @@ import (
 	commonCmd "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/internal/common"
 	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/tree"
 	cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id"
-	"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object"
+	objectSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object"
 	"github.com/spf13/cobra"
 )
 
@@ -53,33 +53,35 @@ func getByPath(cmd *cobra.Command, _ []string) {
 	ctx := cmd.Context()
 
 	cli, err := _client(ctx)
-	commonCmd.ExitOnErr(cmd, "client: %w", err)
+	commonCmd.ExitOnErr(cmd, "failed to create client: %w", err)
 
 	rawCID := make([]byte, sha256.Size)
 	cnr.Encode(rawCID)
 
 	latestOnly, _ := cmd.Flags().GetBool(latestOnlyFlagKey)
 	path, _ := cmd.Flags().GetString(pathFlagKey)
-	// pAttr, _ := cmd.Flags().GetString(pathAttributeFlagKey)
+
+	var bt []byte
+	if t := common.ReadBearerToken(cmd, bearerFlagKey); t != nil {
+		bt = t.Marshal()
+	}
 
 	req := new(tree.GetNodeByPathRequest)
 	req.Body = &tree.GetNodeByPathRequest_Body{
 		ContainerId:   rawCID,
 		TreeId:        tid,
-		PathAttribute: object.AttributeFileName,
+		PathAttribute: objectSDK.AttributeFileName,
 		// PathAttribute: pAttr,
 		Path:          strings.Split(path, "/"),
 		LatestOnly:    latestOnly,
 		AllAttributes: true,
-	}
-	if btok := common.ReadBearerToken(cmd, bearerFlagKey); btok != nil {
-		req.Body.BearerToken = btok.Marshal()
+		BearerToken:   bt,
 	}
 
-	commonCmd.ExitOnErr(cmd, "message signing: %w", tree.SignMessage(req, pk))
+	commonCmd.ExitOnErr(cmd, "signing message: %w", tree.SignMessage(req, pk))
 
 	resp, err := cli.GetNodeByPath(ctx, req)
-	commonCmd.ExitOnErr(cmd, "rpc call: %w", err)
+	commonCmd.ExitOnErr(cmd, "failed to call getNodeByPath: %w", err)
 
 	nn := resp.GetBody().GetNodes()
 	if len(nn) == 0 {

cmd/frostfs-cli/modules/tree/get_op_log.go

@@ -0,0 +1,92 @@
+package tree
+
+import (
+	"crypto/sha256"
+	"errors"
+	"io"
+
+	"git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags"
+	"git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/key"
+	commonCmd "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/internal/common"
+	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/pilorama"
+	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/tree"
+	cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id"
+	"github.com/spf13/cobra"
+)
+
+var getOpLogCmd = &cobra.Command{
+	Use:   "get-op-log",
+	Short: "Get logged operations starting with some height",
+	Run:   getOpLog,
+	PersistentPreRun: func(cmd *cobra.Command, _ []string) {
+		commonflags.Bind(cmd)
+	},
+}
+
+func initGetOpLogCmd() {
+	commonflags.Init(getOpLogCmd)
+	initCTID(getOpLogCmd)
+
+	ff := getOpLogCmd.Flags()
+	ff.Uint64(heightFlagKey, 0, "Height to start with")
+	ff.Uint64(countFlagKey, 10, "Logged operations count")
+
+	_ = cobra.MarkFlagRequired(ff, commonflags.RPC)
+}
+
+func getOpLog(cmd *cobra.Command, _ []string) {
+	pk := key.GetOrGenerate(cmd)
+
+	cidRaw, _ := cmd.Flags().GetString(commonflags.CIDFlag)
+
+	var cnr cid.ID
+	err := cnr.DecodeString(cidRaw)
+	commonCmd.ExitOnErr(cmd, "decode container ID string: %w", err)
+
+	tid, _ := cmd.Flags().GetString(treeIDFlagKey)
+	ctx := cmd.Context()
+
+	cli, err := _client(ctx)
+	commonCmd.ExitOnErr(cmd, "failed to create client: %w", err)
+
+	rawCID := make([]byte, sha256.Size)
+	cnr.Encode(rawCID)
+
+	height, _ := cmd.Flags().GetUint64(heightFlagKey)
+	count, _ := cmd.Flags().GetUint64(countFlagKey)
+
+	req := &tree.GetOpLogRequest{
+		Body: &tree.GetOpLogRequest_Body{
+			ContainerId: rawCID,
+			TreeId:      tid,
+			Height:      height,
+			Count:       count,
+		},
+	}
+
+	commonCmd.ExitOnErr(cmd, "signing message: %w", tree.SignMessage(req, pk))
+
+	resp, err := cli.GetOpLog(ctx, req)
+	commonCmd.ExitOnErr(cmd, "get op log: %w", err)
+
+	opLogResp, err := resp.Recv()
+	for ; err == nil; opLogResp, err = resp.Recv() {
+		o := opLogResp.GetBody().GetOperation()
+
+		cmd.Println("Parent ID: ", o.GetParentId())
+
+		cmd.Println("\tChild ID: ", o.GetChildId())
+
+		m := &pilorama.Meta{}
+		err = m.FromBytes(o.GetMeta())
+		commonCmd.ExitOnErr(cmd, "could not unmarshal meta: %w", err)
+		cmd.Printf("\tMeta:\n")
+		cmd.Printf("\t\tTime: %d\n", m.Time)
+		for _, item := range m.Items {
+			cmd.Printf("\t\t%s: %s\n", item.Key, item.Value)
+		}
+	}
+	if !errors.Is(err, io.EOF) {
+		commonCmd.ExitOnErr(cmd, "get op log response stream: %w", err)
+	}
+}

cmd/frostfs-cli/modules/tree/healthcheck.go

@@ -0,0 +1,43 @@
+package tree
+
+import (
+	"git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/common"
+	"git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags"
+	"git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/key"
+	commonCmd "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/internal/common"
+	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/tree"
+	"github.com/spf13/cobra"
+)
+
+var healthcheckCmd = &cobra.Command{
+	Use:   "healthcheck",
+	Short: "Check tree service availability",
+	Run:   healthcheck,
+	PersistentPreRun: func(cmd *cobra.Command, _ []string) {
+		commonflags.Bind(cmd)
+	},
+}
+
+func initHealthcheckCmd() {
+	commonflags.Init(healthcheckCmd)
+	ff := healthcheckCmd.Flags()
+	_ = cobra.MarkFlagRequired(ff, commonflags.RPC)
+}
+
+func healthcheck(cmd *cobra.Command, _ []string) {
+	pk := key.GetOrGenerate(cmd)
+	ctx := cmd.Context()
+
+	cli, err := _client(ctx)
+	commonCmd.ExitOnErr(cmd, "failed to create client: %w", err)
+
+	req := &tree.HealthcheckRequest{
+		Body: &tree.HealthcheckRequest_Body{},
+	}
+	commonCmd.ExitOnErr(cmd, "signing message: %w", tree.SignMessage(req, pk))
+
+	_, err = cli.Healthcheck(ctx, req)
+	commonCmd.ExitOnErr(cmd, "failed to call healthcheck: %w", err)
+
+	common.PrintVerbose(cmd, "Successful healthcheck invocation.")
+}

cmd/frostfs-cli/modules/tree/list.go

@@ -41,7 +41,7 @@ func list(cmd *cobra.Command, _ []string) {
 	ctx := cmd.Context()
 
 	cli, err := _client(ctx)
-	commonCmd.ExitOnErr(cmd, "client: %w", err)
+	commonCmd.ExitOnErr(cmd, "failed to create client: %w", err)
 
 	rawCID := make([]byte, sha256.Size)
 	cnr.Encode(rawCID)
@@ -52,10 +52,10 @@ func list(cmd *cobra.Command, _ []string) {
 		},
 	}
 
-	commonCmd.ExitOnErr(cmd, "message signing: %w", tree.SignMessage(req, pk))
+	commonCmd.ExitOnErr(cmd, "signing message: %w", tree.SignMessage(req, pk))
 
 	resp, err := cli.TreeList(ctx, req)
-	commonCmd.ExitOnErr(cmd, "rpc call: %w", err)
+	commonCmd.ExitOnErr(cmd, "failed to call treeList %w", err)
 
 	for _, treeID := range resp.GetBody().GetIds() {
 		cmd.Println(treeID)

cmd/frostfs-cli/modules/tree/move.go

@@ -0,0 +1,107 @@
+package tree
+
+import (
+	"crypto/sha256"
+	"errors"
+	"io"
+
+	"git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/common"
+	"git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags"
+	"git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/key"
+	commonCmd "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/internal/common"
+	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/tree"
+	cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id"
+	"github.com/spf13/cobra"
+)
+
+var moveCmd = &cobra.Command{
+	Use:   "move",
+	Short: "Move node",
+	Run:   move,
+	PersistentPreRun: func(cmd *cobra.Command, _ []string) {
+		commonflags.Bind(cmd)
+	},
+}
+
+func initMoveCmd() {
+	commonflags.Init(moveCmd)
+	initCTID(moveCmd)
+
+	ff := moveCmd.Flags()
+	ff.Uint64(nodeIDFlagKey, 0, "Node ID.")
+	ff.Uint64(parentIDFlagKey, 0, "Parent ID.")
+
+	_ = getSubtreeCmd.MarkFlagRequired(nodeIDFlagKey)
+	_ = getSubtreeCmd.MarkFlagRequired(parentIDFlagKey)
+
+	_ = cobra.MarkFlagRequired(ff, commonflags.RPC)
+}
+
+func move(cmd *cobra.Command, _ []string) {
+	pk := key.GetOrGenerate(cmd)
+	cidString, _ := cmd.Flags().GetString(commonflags.CIDFlag)
+
+	var cnr cid.ID
+	err := cnr.DecodeString(cidString)
+	commonCmd.ExitOnErr(cmd, "decode container ID string: %w", err)
+
+	ctx := cmd.Context()
+
+	cli, err := _client(ctx)
+	commonCmd.ExitOnErr(cmd, "failed to create client: %w", err)
+
+	rawCID := make([]byte, sha256.Size)
+	cnr.Encode(rawCID)
+
+	tid, _ := cmd.Flags().GetString(treeIDFlagKey)
+	pid, _ := cmd.Flags().GetUint64(parentIDFlagKey)
+	nid, _ := cmd.Flags().GetUint64(nodeIDFlagKey)
+
+	var bt []byte
+	if t := common.ReadBearerToken(cmd, bearerFlagKey); t != nil {
+		bt = t.Marshal()
+	}
+
+	subTreeReq := &tree.GetSubTreeRequest{
+		Body: &tree.GetSubTreeRequest_Body{
+			ContainerId: rawCID,
+			TreeId:      tid,
+			RootId:      nid,
+			Depth:       1,
+			BearerToken: bt,
+		},
+	}
+	commonCmd.ExitOnErr(cmd, "signing message: %w", tree.SignMessage(subTreeReq, pk))
+	resp, err := cli.GetSubTree(ctx, subTreeReq)
+	commonCmd.ExitOnErr(cmd, "rpc call: %w", err)
+
+	var meta []*tree.KeyValue
+	subtreeResp, err := resp.Recv()
+	for ; err == nil; subtreeResp, err = resp.Recv() {
+		meta = subtreeResp.GetBody().GetMeta()
+	}
+	if !errors.Is(err, io.EOF) {
+		commonCmd.ExitOnErr(cmd, "failed to read getSubTree response stream: %w", err)
+	}
+	var metaErr error
+	if len(meta) == 0 {
+		metaErr = errors.New("no meta for given node ID")
+	}
+	commonCmd.ExitOnErr(cmd, "unexpected rpc call result: %w", metaErr)
+
+	req := &tree.MoveRequest{
+		Body: &tree.MoveRequest_Body{
+			ContainerId: rawCID,
+			TreeId:      tid,
+			ParentId:    pid,
+			NodeId:      nid,
+			Meta:        meta,
+		},
+	}
+
+	commonCmd.ExitOnErr(cmd, "signing message: %w", tree.SignMessage(req, pk))
+
+	_, err = cli.Move(ctx, req)
+	commonCmd.ExitOnErr(cmd, "failed to call move: %w", err)
+	common.PrintVerbose(cmd, "Successful move invocation.")
+}

cmd/frostfs-cli/modules/tree/remove.go

@@ -0,0 +1,74 @@
+package tree
+
+import (
+	"crypto/sha256"
+
+	"git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/common"
+	"git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags"
+	"git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/key"
+	commonCmd "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/internal/common"
+	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/tree"
+	cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id"
+	"github.com/spf13/cobra"
+)
+
+var removeCmd = &cobra.Command{
+	Use:   "remove",
+	Short: "Remove node",
+	Run:   remove,
+	PersistentPreRun: func(cmd *cobra.Command, _ []string) {
+		commonflags.Bind(cmd)
+	},
+}
+
+func initRemoveCmd() {
+	commonflags.Init(removeCmd)
+	initCTID(removeCmd)
+
+	ff := removeCmd.Flags()
+	ff.Uint64(nodeIDFlagKey, 0, "Node ID.")
+
+	_ = getSubtreeCmd.MarkFlagRequired(nodeIDFlagKey)
+
+	_ = cobra.MarkFlagRequired(ff, commonflags.RPC)
+}
+
+func remove(cmd *cobra.Command, _ []string) {
+	pk := key.GetOrGenerate(cmd)
+	cidString, _ := cmd.Flags().GetString(commonflags.CIDFlag)
+
+	var cnr cid.ID
+	err := cnr.DecodeString(cidString)
+	commonCmd.ExitOnErr(cmd, "decode container ID string: %w", err)
+
+	ctx := cmd.Context()
+
+	cli, err := _client(ctx)
+	commonCmd.ExitOnErr(cmd, "failed to create client: %w", err)
+
+	rawCID := make([]byte, sha256.Size)
+	cnr.Encode(rawCID)
+
+	tid, _ := cmd.Flags().GetString(treeIDFlagKey)
+
+	nid, _ := cmd.Flags().GetUint64(nodeIDFlagKey)
+
+	var bt []byte
+	if t := common.ReadBearerToken(cmd, bearerFlagKey); t != nil {
+		bt = t.Marshal()
+	}
+	req := &tree.RemoveRequest{
+		Body: &tree.RemoveRequest_Body{
+			ContainerId: rawCID,
+			TreeId:      tid,
+			NodeId:      nid,
+			BearerToken: bt,
+		},
+	}
+
+	commonCmd.ExitOnErr(cmd, "signing message: %w", tree.SignMessage(req, pk))
+
+	_, err = cli.Remove(ctx, req)
+	commonCmd.ExitOnErr(cmd, "failed to call remove: %w", err)
+	common.PrintVerbose(cmd, "Successful remove invocation.")
+}

cmd/frostfs-cli/modules/tree/root.go

@@ -15,16 +15,28 @@ func init() {
 	Cmd.AddCommand(getByPathCmd)
 	Cmd.AddCommand(addByPathCmd)
 	Cmd.AddCommand(listCmd)
+	Cmd.AddCommand(healthcheckCmd)
+	Cmd.AddCommand(moveCmd)
+	Cmd.AddCommand(removeCmd)
+	Cmd.AddCommand(getSubtreeCmd)
+	Cmd.AddCommand(getOpLogCmd)
 
 	initAddCmd()
 	initGetByPathCmd()
 	initAddByPathCmd()
 	initListCmd()
+	initHealthcheckCmd()
+	initMoveCmd()
+	initRemoveCmd()
+	initGetSubtreeCmd()
+	initGetOpLogCmd()
 }
 
 const (
 	treeIDFlagKey   = "tid"
 	parentIDFlagKey = "pid"
+	nodeIDFlagKey   = "nid"
+	rootIDFlagKey   = "root"
 
 	metaFlagKey = "meta"
 
@@ -34,6 +46,10 @@ const (
 	latestOnlyFlagKey = "latest"
 
 	bearerFlagKey = "bearer"
+
+	heightFlagKey = "height"
+	countFlagKey  = "count"
+	depthFlagKey  = "depth"
 )
 
 func initCTID(cmd *cobra.Command) {
@@ -45,5 +61,5 @@ func initCTID(cmd *cobra.Command) {
 	ff.String(treeIDFlagKey, "", "Tree ID")
 	_ = cmd.MarkFlagRequired(treeIDFlagKey)
 
-	ff.StringP(bearerFlagKey, "", "", "Path to bearer token")
+	ff.String(bearerFlagKey, "", "Path to bearer token")
 }

cmd/frostfs-cli/modules/tree/subtree.go

@@ -0,0 +1,101 @@
+package tree
+
+import (
+	"crypto/sha256"
+	"errors"
+	"io"
+
+	"git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/common"
+	"git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags"
+	"git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/key"
+	commonCmd "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/internal/common"
+	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/tree"
+	cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id"
+	"github.com/spf13/cobra"
+)
+
+var getSubtreeCmd = &cobra.Command{
+	Use:   "get-subtree",
+	Short: "Get subtree",
+	Run:   getSubTree,
+	PersistentPreRun: func(cmd *cobra.Command, _ []string) {
+		commonflags.Bind(cmd)
+	},
+}
+
+func initGetSubtreeCmd() {
+	commonflags.Init(getSubtreeCmd)
+	initCTID(getSubtreeCmd)
+
+	ff := getSubtreeCmd.Flags()
+	ff.Uint64(rootIDFlagKey, 0, "Root ID to traverse from.")
+	ff.Uint32(depthFlagKey, 10, "Traversal depth.")
+
+	_ = getSubtreeCmd.MarkFlagRequired(commonflags.CIDFlag)
+	_ = getSubtreeCmd.MarkFlagRequired(treeIDFlagKey)
+
+	_ = cobra.MarkFlagRequired(ff, commonflags.RPC)
+}
+
+func getSubTree(cmd *cobra.Command, _ []string) {
+	pk := key.GetOrGenerate(cmd)
+	cidString, _ := cmd.Flags().GetString(commonflags.CIDFlag)
+
+	var cnr cid.ID
+	err := cnr.DecodeString(cidString)
+	commonCmd.ExitOnErr(cmd, "decode container ID string: %w", err)
+
+	ctx := cmd.Context()
+
+	cli, err := _client(ctx)
+	commonCmd.ExitOnErr(cmd, "failed to create client: %w", err)
+
+	rawCID := make([]byte, sha256.Size)
+	cnr.Encode(rawCID)
+
+	tid, _ := cmd.Flags().GetString(treeIDFlagKey)
+
+	rid, _ := cmd.Flags().GetUint64(rootIDFlagKey)
+
+	depth, _ := cmd.Flags().GetUint32(depthFlagKey)
+
+	var bt []byte
+	if t := common.ReadBearerToken(cmd, bearerFlagKey); t != nil {
+		bt = t.Marshal()
+	}
+
+	req := &tree.GetSubTreeRequest{
+		Body: &tree.GetSubTreeRequest_Body{
+			ContainerId: rawCID,
+			TreeId:      tid,
+			RootId:      rid,
+			Depth:       depth,
+			BearerToken: bt,
+		},
+	}
+
+	commonCmd.ExitOnErr(cmd, "signing message: %w", tree.SignMessage(req, pk))
+
+	resp, err := cli.GetSubTree(ctx, req)
+	commonCmd.ExitOnErr(cmd, "failed to call getSubTree: %w", err)
+
+	subtreeResp, err := resp.Recv()
+	for ; err == nil; subtreeResp, err = resp.Recv() {
+		b := subtreeResp.GetBody()
+
+		cmd.Printf("Node ID: %d\n", b.GetNodeId())
+
+		cmd.Println("\tParent ID: ", b.GetParentId())
+		cmd.Println("\tTimestamp: ", b.GetTimestamp())
+
+		if meta := b.GetMeta(); len(meta) > 0 {
+			cmd.Println("\tMeta pairs: ")
+			for _, kv := range meta {
+				cmd.Printf("\t\t%s: %s\n", kv.GetKey(), string(kv.GetValue()))
+			}
+		}
+	}
+	if !errors.Is(err, io.EOF) {
+		commonCmd.ExitOnErr(cmd, "rpc call: %w", err)
+	}
+}

cmd/frostfs-lens/internal/blobovnicza/inspect.go

@@ -3,7 +3,7 @@ package blobovnicza
 import (
 	common "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-lens/internal"
 	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobovnicza"
-	"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object"
+	objectSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object"
 	oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id"
 	"github.com/spf13/cobra"
 )
@@ -38,7 +38,7 @@ func inspectFunc(cmd *cobra.Command, _ []string) {
 
 	data := res.Object()
 
-	var o object.Object
+	var o objectSDK.Object
 	common.ExitOnErr(cmd, common.Errf("could not unmarshal object: %w",
 		o.Unmarshal(data)),
 	)

cmd/frostfs-lens/internal/flags.go

@@ -8,6 +8,7 @@ const (
 	flagAddress    = "address"
 	flagEnginePath = "path"
 	flagOutFile    = "out"
+	flagDBType     = "dbtype"
 )
 
 // AddAddressFlag adds the address flag to the passed cobra command.
@@ -33,3 +34,9 @@ func AddOutputFileFlag(cmd *cobra.Command, v *string) {
 		"File to save object payload")
 	_ = cmd.MarkFlagFilename(flagOutFile)
 }
+
+// AddDBTypeFlag adds the DB type flag to the passed cobra command.
+func AddDBTypeFlag(cmd *cobra.Command, v *string) {
+	cmd.Flags().StringVar(v, flagOutFile, "bbolt",
+		"Type of DB used by write cache (default: bbolt)")
+}

cmd/frostfs-lens/internal/meta/inspect.go

@@ -7,7 +7,7 @@ import (
 	common "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-lens/internal"
 	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobovnicza"
 	meta "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase"
-	"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object"
+	objectSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object"
 	oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id"
 	"github.com/spf13/cobra"
 )
@@ -49,7 +49,7 @@ func inspectFunc(cmd *cobra.Command, _ []string) {
 	prm.SetAddress(addr)
 	prm.SetRaw(true)
 
-	siErr := new(object.SplitInfoError)
+	siErr := new(objectSDK.SplitInfoError)
 
 	res, err := db.Get(cmd.Context(), prm)
 	if errors.As(err, &siErr) {

cmd/frostfs-lens/internal/printers.go

@@ -4,14 +4,14 @@ import (
 	"os"
 
 	cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id"
-	"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object"
+	objectSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object"
 	oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id"
 	"github.com/spf13/cobra"
 )
 
 // PrintObjectHeader prints passed object's header fields via
 // the passed cobra command. Does nothing with the payload.
-func PrintObjectHeader(cmd *cobra.Command, h object.Object) {
+func PrintObjectHeader(cmd *cobra.Command, h objectSDK.Object) {
 	cmd.Println("Version:", h.Version())
 	cmd.Println("Type:", h.Type())
 	printContainerID(cmd, h.ContainerID)

cmd/frostfs-lens/internal/writecache/inspect.go

@@ -1,9 +1,14 @@
 package writecache
 
 import (
+	"fmt"
+	"os"
+
 	common "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-lens/internal"
-	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/writecache"
-	"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object"
+	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/writecache/writecachebadger"
+	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/writecache/writecachebbolt"
+	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/logger"
+	objectSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object"
 	"github.com/spf13/cobra"
 )
 
@@ -18,16 +23,36 @@ func init() {
 	common.AddAddressFlag(inspectCMD, &vAddress)
 	common.AddComponentPathFlag(inspectCMD, &vPath)
 	common.AddOutputFileFlag(inspectCMD, &vOut)
+	common.AddDBTypeFlag(inspectCMD, &vDBType)
 }
 
 func inspectFunc(cmd *cobra.Command, _ []string) {
-	db := openWC(cmd)
+	var data []byte
+
+	switch vDBType {
+	case "bbolt":
+		db, err := writecachebbolt.OpenDB(vPath, true, os.OpenFile)
+		common.ExitOnErr(cmd, common.Errf("could not open write-cache db: %w", err))
 		defer db.Close()
 
-	data, err := writecache.Get(db, []byte(vAddress))
+		data, err = writecachebbolt.Get(db, []byte(vAddress))
 		common.ExitOnErr(cmd, common.Errf("could not fetch object: %w", err))
 
-	var o object.Object
+	case "badger":
+		log, err := logger.NewLogger(&logger.Prm{})
+		common.ExitOnErr(cmd, common.Errf("could not create logger: %w", err))
+
+		db, err := writecachebadger.OpenDB(vPath, true, log)
+		common.ExitOnErr(cmd, common.Errf("could not open write-cache db: %w", err))
+
+		data, err = writecachebadger.Get(db, []byte(vAddress))
+		common.ExitOnErr(cmd, common.Errf("could not fetch object: %w", err))
+
+	default:
+		common.ExitOnErr(cmd, fmt.Errorf("invalid dbtype: %q (possible values: bbolt, badger)", vDBType))
+	}
+
+	var o objectSDK.Object
 	common.ExitOnErr(cmd, common.Errf("could not unmarshal object: %w", o.Unmarshal(data)))
 
 	common.PrintObjectHeader(cmd, o)

cmd/frostfs-lens/internal/writecache/list.go

@@ -3,9 +3,12 @@ package writecache
 import (
 	"fmt"
 	"io"
+	"os"
 
 	common "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-lens/internal"
-	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/writecache"
+	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/writecache/writecachebadger"
+	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/writecache/writecachebbolt"
+	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/logger"
 	oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id"
 	"github.com/spf13/cobra"
 )
@@ -30,9 +33,26 @@ func listFunc(cmd *cobra.Command, _ []string) {
 		return err
 	}
 
-	db := openWC(cmd)
+	switch vDBType {
+	case "bbolt":
+		db, err := writecachebbolt.OpenDB(vPath, true, os.OpenFile)
+		common.ExitOnErr(cmd, common.Errf("could not open write-cache db: %w", err))
 		defer db.Close()
 
-	err := writecache.IterateDB(db, wAddr)
+		err = writecachebbolt.IterateDB(db, wAddr)
 		common.ExitOnErr(cmd, common.Errf("write-cache iterator failure: %w", err))
+
+	case "badger":
+		log, err := logger.NewLogger(&logger.Prm{})
+		common.ExitOnErr(cmd, common.Errf("could not create logger: %w", err))
+
+		db, err := writecachebadger.OpenDB(vPath, true, log)
+		common.ExitOnErr(cmd, common.Errf("could not open write-cache db: %w", err))
+
+		err = writecachebadger.IterateDB(db, wAddr)
+		common.ExitOnErr(cmd, common.Errf("write-cache iterator failure: %w", err))
+
+	default:
+		common.ExitOnErr(cmd, fmt.Errorf("invalid dbtype: %q (possible values: bbolt, badger)", vDBType))
+	}
 }

cmd/frostfs-lens/internal/writecache/root.go

@@ -1,18 +1,14 @@
 package writecache
 
 import (
-	"os"
-
-	common "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-lens/internal"
-	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/writecache"
 	"github.com/spf13/cobra"
-	"go.etcd.io/bbolt"
 )
 
 var (
 	vAddress string
 	vPath    string
 	vOut     string
+	vDBType  string
 )
 
 // Root contains `write-cache` command definition.
@@ -24,10 +20,3 @@ var Root = &cobra.Command{
 func init() {
 	Root.AddCommand(listCMD, inspectCMD)
 }
-
-func openWC(cmd *cobra.Command) *bbolt.DB {
-	db, err := writecache.OpenDB(vPath, true, os.OpenFile)
-	common.ExitOnErr(cmd, common.Errf("could not open write-cache db: %w", err))
-
-	return db
-}

cmd/frostfs-lens/root.go

@@ -38,7 +38,7 @@ func init() {
 		blobovnicza.Root,
 		meta.Root,
 		writecache.Root,
-		gendoc.Command(command),
+		gendoc.Command(command, gendoc.Options{}),
 	)
 }
 

cmd/frostfs-node/cache.go

@@ -8,6 +8,7 @@ import (
 	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/netmap"
 	cntClient "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client/container"
 	putsvc "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/object/put"
+	utilSync "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/sync"
 	apistatus "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client/status"
 	cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id"
 	netmapSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/netmap"
@@ -24,59 +25,6 @@ type valueWithTime[V any] struct {
 	e error
 }
 
-type locker struct {
-	mtx     sync.Mutex
-	waiters int // not protected by mtx, must used outer mutex to update concurrently
-}
-
-type keyLocker[K comparable] struct {
-	lockers    map[K]*locker
-	lockersMtx sync.Mutex
-}
-
-func newKeyLocker[K comparable]() *keyLocker[K] {
-	return &keyLocker[K]{
-		lockers: make(map[K]*locker),
-	}
-}
-
-func (l *keyLocker[K]) LockKey(key K) {
-	l.lockersMtx.Lock()
-
-	if locker, found := l.lockers[key]; found {
-		locker.waiters++
-		l.lockersMtx.Unlock()
-
-		locker.mtx.Lock()
-		return
-	}
-
-	locker := &locker{
-		waiters: 1,
-	}
-	locker.mtx.Lock()
-
-	l.lockers[key] = locker
-	l.lockersMtx.Unlock()
-}
-
-func (l *keyLocker[K]) UnlockKey(key K) {
-	l.lockersMtx.Lock()
-	defer l.lockersMtx.Unlock()
-
-	locker, found := l.lockers[key]
-	if !found {
-		return
-	}
-
-	if locker.waiters == 1 {
-		delete(l.lockers, key)
-	}
-	locker.waiters--
-
-	locker.mtx.Unlock()
-}
-
 // entity that provides TTL cache interface.
 type ttlNetCache[K comparable, V any] struct {
 	ttl time.Duration
@@ -87,7 +35,7 @@ type ttlNetCache[K comparable, V any] struct {
 
 	netRdr netValueReader[K, V]
 
-	keyLocker *keyLocker[K]
+	keyLocker *utilSync.KeyLocker[K]
 }
 
 // complicates netValueReader with TTL caching mechanism.
@@ -100,7 +48,7 @@ func newNetworkTTLCache[K comparable, V any](sz int, ttl time.Duration, netRdr n
 		sz:        sz,
 		cache:     cache,
 		netRdr:    netRdr,
-		keyLocker: newKeyLocker[K](),
+		keyLocker: utilSync.NewKeyLocker[K](),
 	}
 }
 
@@ -115,8 +63,8 @@ func (c *ttlNetCache[K, V]) get(key K) (V, error) {
 		return val.v, val.e
 	}
 
-	c.keyLocker.LockKey(key)
-	defer c.keyLocker.UnlockKey(key)
+	c.keyLocker.Lock(key)
+	defer c.keyLocker.Unlock(key)
 
 	val, ok = c.cache.Peek(key)
 	if ok && time.Since(val.t) < c.ttl {
@@ -135,8 +83,8 @@ func (c *ttlNetCache[K, V]) get(key K) (V, error) {
 }
 
 func (c *ttlNetCache[K, V]) set(k K, v V, e error) {
-	c.keyLocker.LockKey(k)
-	defer c.keyLocker.UnlockKey(k)
+	c.keyLocker.Lock(k)
+	defer c.keyLocker.Unlock(k)
 
 	c.cache.Add(k, &valueWithTime[V]{
 		v: v,
@@ -146,8 +94,8 @@ func (c *ttlNetCache[K, V]) set(k K, v V, e error) {
 }
 
 func (c *ttlNetCache[K, V]) remove(key K) {
-	c.keyLocker.LockKey(key)
-	defer c.keyLocker.UnlockKey(key)
+	c.keyLocker.Lock(key)
+	defer c.keyLocker.Unlock(key)
 
 	c.cache.Remove(key)
 }
@@ -208,7 +156,7 @@ func newCachedContainerStorage(v container.Source, ttl time.Duration) ttlContain
 }
 
 func (s ttlContainerStorage) handleRemoval(cnr cid.ID) {
-	s.set(cnr, nil, apistatus.ContainerNotFound{})
+	s.set(cnr, nil, new(apistatus.ContainerNotFound))
 }
 
 // Get returns container value from the cache. If value is missing in the cache

cmd/frostfs-node/config.go

@@ -40,7 +40,9 @@ import (
 	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/pilorama"
 	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard"
 	shardmode "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard/mode"
-	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/writecache"
+	writecacheconfig "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/writecache/config"
+	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/writecache/writecachebadger"
+	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/writecache/writecachebbolt"
 	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/metrics"
 	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client"
 	containerClient "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client/container"
@@ -127,6 +129,7 @@ type shardCfg struct {
 
 	writecacheCfg struct {
 		enabled          bool
+		typ              writecacheconfig.Type
 		path             string
 		maxBatchSize     int
 		maxBatchDelay    time.Duration
@@ -135,6 +138,7 @@ type shardCfg struct {
 		flushWorkerCount int
 		sizeLimit        uint64
 		noSync           bool
+		gcInterval       time.Duration
 	}
 
 	piloramaCfg struct {
@@ -238,6 +242,7 @@ func (a *applicationConfiguration) setShardWriteCacheConfig(newConfig *shardCfg,
 		wc := &newConfig.writecacheCfg
 
 		wc.enabled = true
+		wc.typ = writeCacheCfg.Type()
 		wc.path = writeCacheCfg.Path()
 		wc.maxBatchSize = writeCacheCfg.BoltDB().MaxBatchSize()
 		wc.maxBatchDelay = writeCacheCfg.BoltDB().MaxBatchDelay()
@@ -246,6 +251,7 @@ func (a *applicationConfiguration) setShardWriteCacheConfig(newConfig *shardCfg,
 		wc.flushWorkerCount = writeCacheCfg.WorkersNumber()
 		wc.sizeLimit = writeCacheCfg.SizeLimit()
 		wc.noSync = writeCacheCfg.NoSync()
+		wc.gcInterval = writeCacheCfg.GCInterval()
 	}
 }
 
@@ -338,6 +344,7 @@ type internals struct {
 	healthStatus *atomic.Int32
 	// is node under maintenance
 	isMaintenance      atomic.Bool
+	alreadyBootstraped bool
 }
 
 // starts node's maintenance.
@@ -439,6 +446,8 @@ type cfgGRPC struct {
 
 	servers []*grpc.Server
 
+	endpoints []string
+
 	maxChunkSize uint64
 
 	maxAddrAmount uint64
@@ -621,7 +630,7 @@ func initShared(appCfg *config.Config, key *keys.PrivateKey, netState *networkSt
 		key:            key,
 		binPublicKey:   key.PublicKey().Bytes(),
 		localAddr:      netAddr,
-		respSvc:        response.NewService(response.WithNetworkState(netState)),
+		respSvc:        response.NewService(netState),
 		clientCache:    cache.NewSDKClientCache(cacheOpts),
 		bgClientCache:  cache.NewSDKClientCache(cacheOpts),
 		putClientCache: cache.NewSDKClientCache(cacheOpts),
@@ -703,20 +712,36 @@ func (c *cfg) shardOpts() []shardOptsWithID {
 	return shards
 }
 
-func (c *cfg) getWriteCacheOpts(shCfg shardCfg) []writecache.Option {
-	var writeCacheOpts []writecache.Option
+func (c *cfg) getWriteCacheOpts(shCfg shardCfg) writecacheconfig.Options {
+	var writeCacheOpts writecacheconfig.Options
 	if wcRead := shCfg.writecacheCfg; wcRead.enabled {
-		writeCacheOpts = append(writeCacheOpts,
-			writecache.WithPath(wcRead.path),
-			writecache.WithMaxBatchSize(wcRead.maxBatchSize),
-			writecache.WithMaxBatchDelay(wcRead.maxBatchDelay),
-			writecache.WithMaxObjectSize(wcRead.maxObjSize),
-			writecache.WithSmallObjectSize(wcRead.smallObjectSize),
-			writecache.WithFlushWorkersCount(wcRead.flushWorkerCount),
-			writecache.WithMaxCacheSize(wcRead.sizeLimit),
-			writecache.WithNoSync(wcRead.noSync),
-			writecache.WithLogger(c.log),
+		switch wcRead.typ {
+		case writecacheconfig.TypeBBolt:
+			writeCacheOpts.Type = writecacheconfig.TypeBBolt
+			writeCacheOpts.BBoltOptions = append(writeCacheOpts.BBoltOptions,
+				writecachebbolt.WithPath(wcRead.path),
+				writecachebbolt.WithMaxBatchSize(wcRead.maxBatchSize),
+				writecachebbolt.WithMaxBatchDelay(wcRead.maxBatchDelay),
+				writecachebbolt.WithMaxObjectSize(wcRead.maxObjSize),
+				writecachebbolt.WithSmallObjectSize(wcRead.smallObjectSize),
+				writecachebbolt.WithFlushWorkersCount(wcRead.flushWorkerCount),
+				writecachebbolt.WithMaxCacheSize(wcRead.sizeLimit),
+				writecachebbolt.WithNoSync(wcRead.noSync),
+				writecachebbolt.WithLogger(c.log),
 			)
+		case writecacheconfig.TypeBadger:
+			writeCacheOpts.Type = writecacheconfig.TypeBadger
+			writeCacheOpts.BadgerOptions = append(writeCacheOpts.BadgerOptions,
+				writecachebadger.WithPath(wcRead.path),
+				writecachebadger.WithMaxObjectSize(wcRead.maxObjSize),
+				writecachebadger.WithFlushWorkersCount(wcRead.flushWorkerCount),
+				writecachebadger.WithMaxCacheSize(wcRead.sizeLimit),
+				writecachebadger.WithLogger(c.log),
+				writecachebadger.WithGCInterval(wcRead.gcInterval),
+			)
+		default:
+			panic(fmt.Sprintf("unknown writecache type: %q", wcRead.typ))
+		}
 	}
 	return writeCacheOpts
 }
@@ -835,7 +860,7 @@ func (c *cfg) getShardOpts(shCfg shardCfg) shardOptsWithID {
 		shard.WithMetaBaseOptions(mbOptions...),
 		shard.WithPiloramaOptions(piloramaOpts...),
 		shard.WithWriteCache(shCfg.writecacheCfg.enabled),
-		shard.WithWriteCacheOptions(writeCacheOpts...),
+		shard.WithWriteCacheOptions(writeCacheOpts),
 		shard.WithRemoverBatchSize(shCfg.gcCfg.removerBatchSize),
 		shard.WithGCRemoverSleepInterval(shCfg.gcCfg.removerSleepInterval),
 		shard.WithExpiredCollectorBatchSize(shCfg.gcCfg.expiredCollectorBatchSize),
@@ -996,13 +1021,6 @@ func (c *cfg) needBootstrap() bool {
 	return c.cfgNetmap.needBootstrap
 }
 
-// ObjectServiceLoad implements system loader interface for policer component.
-// It is calculated as size/capacity ratio of "remote object put" worker.
-// Returns float value between 0.0 and 1.0.
-func (c *cfg) ObjectServiceLoad() float64 {
-	return float64(c.cfgObject.pool.putRemote.Running()) / float64(c.cfgObject.pool.putRemoteCapacity)
-}
-
 type dCmp struct {
 	name       string
 	reloadFunc func() error
@@ -1061,6 +1079,10 @@ func (c *cfg) reloadConfig(ctx context.Context) {
 	}
 
 	components = append(components, dCmp{"logger", logPrm.Reload})
+	components = append(components, dCmp{"runtime", func() error {
+		setRuntimeParameters(c)
+		return nil
+	}})
 	components = append(components, dCmp{"tracing", func() error {
 		updated, err := tracing.Setup(ctx, *tracingconfig.ToTracingConfig(c.appCfg))
 		if updated {

cmd/frostfs-node/config/cast.go

@@ -199,7 +199,7 @@ func parseSizeInBytes(sizeStr string) uint64 {
 		if sizeStr[lastChar] == 'b' || sizeStr[lastChar] == 'B' {
 			lastChar--
 		}
-		if lastChar > 0 {
+		if lastChar >= 0 {
 			switch unicode.ToLower(rune(sizeStr[lastChar])) {
 			case 'k':
 				multiplier = 1 << 10

cmd/frostfs-node/config/cast_test.go

@@ -125,10 +125,15 @@ func TestSizeInBytes(t *testing.T) {
 	)
 	configtest.ForEachFileType("test/config", func(c *config.Config) {
 		c = c.Sub("sizes")
+		require.EqualValues(t, 1, config.SizeInBytesSafe(c, "size_b"))
+		require.EqualValues(t, kb, config.SizeInBytesSafe(c, "size_k"))
 		require.EqualValues(t, kb, config.SizeInBytesSafe(c, "size_kb"))
 		require.EqualValues(t, 2*kb, config.SizeInBytesSafe(c, "size_kb_no_space"))
+		require.EqualValues(t, 12*mb, config.SizeInBytesSafe(c, "size_m"))
 		require.EqualValues(t, 12*mb, config.SizeInBytesSafe(c, "size_mb"))
+		require.EqualValues(t, 4*gb, config.SizeInBytesSafe(c, "size_g"))
 		require.EqualValues(t, 4*gb, config.SizeInBytesSafe(c, "size_gb"))
+		require.EqualValues(t, 5*tb, config.SizeInBytesSafe(c, "size_t"))
 		require.EqualValues(t, 5*tb, config.SizeInBytesSafe(c, "size_tb"))
 		require.EqualValues(t, 12, config.SizeInBytesSafe(c, "size_i_am_not_very_clever"))
 		require.EqualValues(t, tb/2, config.SizeInBytesSafe(c, "size_float"))

cmd/frostfs-node/config/engine/shard/writecache/config.go

@@ -1,8 +1,12 @@
 package writecacheconfig
 
 import (
+	"fmt"
+	"time"
+
 	"git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-node/config"
 	boltdbconfig "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/engine/shard/boltdb"
+	writecacheconfig "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/writecache/config"
 )
 
 // Config is a wrapper over the config section
@@ -21,6 +25,9 @@ const (
 
 	// SizeLimitDefault is a default write-cache size limit.
 	SizeLimitDefault = 1 << 30
+
+	// DefaultGCInterval is the default duration of the GC cycle interval.
+	DefaultGCInterval = 1 * time.Minute
 )
 
 // From wraps config section into Config.
@@ -35,6 +42,22 @@ func (x *Config) Enabled() bool {
 	return config.Bool((*config.Config)(x), "enabled")
 }
 
+// Type returns the writecache implementation type to use.
+//
+// Panics if the type is not recognized.
+func (x *Config) Type() writecacheconfig.Type {
+	t := config.String((*config.Config)(x), "type")
+
+	switch t {
+	case "bbolt", "":
+		return writecacheconfig.TypeBBolt
+	case "badger":
+		return writecacheconfig.TypeBadger
+	}
+
+	panic(fmt.Sprintf("invalid writecache type: %q", t))
+}
+
 // Path returns the value of "path" config parameter.
 //
 // Panics if the value is not a non-empty string.
@@ -126,3 +149,16 @@ func (x *Config) NoSync() bool {
 func (x *Config) BoltDB() *boltdbconfig.Config {
 	return (*boltdbconfig.Config)(x)
 }
+
+// GCInterval returns the value of "gc_interval" config parameter.
+//
+// Returns DefaultGCInterval if the value is not a positive duration.
+func (x *Config) GCInterval() time.Duration {
+	d := config.DurationSafe((*config.Config)(x), "gc_interval")
+
+	if d > 0 {
+		return d
+	}
+
+	return DefaultGCInterval
+}

cmd/frostfs-node/config/runtime/config.go

@@ -0,0 +1,23 @@
+package runtime
+
+import (
+	"math"
+
+	"git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-node/config"
+)
+
+const (
+	subsection         = "runtime"
+	memoryLimitDefault = math.MaxInt64
+)
+
+// GCMemoryLimitBytes returns the  value of "soft_memory_limit" config parameter from "runtime" section.
+func GCMemoryLimitBytes(c *config.Config) int64 {
+	l := config.SizeInBytesSafe(c.Sub(subsection), "soft_memory_limit")
+
+	if l > 0 {
+		return int64(l)
+	}
+
+	return memoryLimitDefault
+}

cmd/frostfs-node/config/runtime/config_test.go

@@ -0,0 +1,30 @@
+package runtime
+
+import (
+	"math"
+	"testing"
+
+	"git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-node/config"
+	configtest "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/test"
+	"github.com/stretchr/testify/require"
+)
+
+func TestGCMemoryLimit(t *testing.T) {
+	t.Run("defaults", func(t *testing.T) {
+		empty := configtest.EmptyConfig()
+
+		require.Equal(t, int64(math.MaxInt64), GCMemoryLimitBytes(empty))
+	})
+
+	const path = "../../../../config/example/node"
+
+	fileConfigTest := func(c *config.Config) {
+		require.Equal(t, int64(1073741824), GCMemoryLimitBytes(c))
+	}
+
+	configtest.ForEachFileType(path, fileConfigTest)
+
+	t.Run("ENV", func(t *testing.T) {
+		configtest.ForEnvFileType(t, path, fileConfigTest)
+	})
+}

cmd/frostfs-node/config/test/config.json

@@ -49,10 +49,15 @@
   },
 
   "sizes": {
+    "size_b": "1b",
+    "size_k": "1 k",
     "size_kb": "1 kb",
     "size_kb_no_space": "2kb",
-    "size_mb": "12m",
-    "size_gb": "4g",
+    "size_m": "12m",
+    "size_mb": "12mb",
+    "size_g": "4g",
+    "size_gb": "4gb",
+    "size_t": "5 T",
     "size_tb": "5 TB",
     "size_float": ".5t",
     "size_float_big": "14.123 gb",

cmd/frostfs-node/config/test/config.yaml

@@ -42,10 +42,15 @@ bool:
   incorrect: not true
 
 sizes:
+  size_b: 1b
+  size_k: 1 k
   size_kb: 1 kb
   size_kb_no_space: 2kb
-  size_mb: 12m
-  size_gb: 4g
+  size_m: 12m
+  size_mb: 12mb
+  size_g: 4g
+  size_gb: 4gb
+  size_t: 5 T
   size_tb: 5 TB
   size_float: .5t
   size_float_big: 14.123 gb

cmd/frostfs-node/config/tree/config_test.go

@@ -7,6 +7,7 @@ import (
 	"git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-node/config"
 	configtest "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/test"
 	treeconfig "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/tree"
+	"github.com/nspcc-dev/neo-go/pkg/crypto/keys"
 	"github.com/stretchr/testify/require"
 )
 
@@ -21,10 +22,19 @@ func TestTreeSection(t *testing.T) {
 		require.Equal(t, 0, treeSec.ReplicationChannelCapacity())
 		require.Equal(t, 0, treeSec.ReplicationWorkerCount())
 		require.Equal(t, time.Duration(0), treeSec.ReplicationTimeout())
+		require.Equal(t, 0, len(treeSec.AuthorizedKeys()))
 	})
 
 	const path = "../../../../config/example/node"
 
+	var expectedKeys keys.PublicKeys
+	key, err := keys.NewPublicKeyFromString("0397d207ea77909f7d66fa6f36d08daae22ace672be7ea4f53513484dde8a142a0")
+	require.NoError(t, err)
+	expectedKeys = append(expectedKeys, key)
+	key, err = keys.NewPublicKeyFromString("02053819235c20d784132deba10bb3061629e3a5c819a039ef091841d9d35dad56")
+	require.NoError(t, err)
+	expectedKeys = append(expectedKeys, key)
+
 	var fileConfigTest = func(c *config.Config) {
 		treeSec := treeconfig.Tree(c)
 
@@ -34,6 +44,7 @@ func TestTreeSection(t *testing.T) {
 		require.Equal(t, 32, treeSec.ReplicationWorkerCount())
 		require.Equal(t, 5*time.Second, treeSec.ReplicationTimeout())
 		require.Equal(t, time.Hour, treeSec.SyncInterval())
+		require.Equal(t, expectedKeys, treeSec.AuthorizedKeys())
 	}
 
 	configtest.ForEachFileType(path, fileConfigTest)

cmd/frostfs-node/grpc.go

@@ -69,11 +69,14 @@ func initGRPC(c *cfg) {
 
 		lis, err := net.Listen("tcp", sc.Endpoint())
 		if err != nil {
+			c.metricsCollector.GrpcServerMetrics().MarkUnhealthy(sc.Endpoint())
 			c.log.Error(logs.FrostFSNodeCantListenGRPCEndpoint, zap.Error(err))
 			return
 		}
+		c.metricsCollector.GrpcServerMetrics().MarkHealthy(sc.Endpoint())
 
 		c.cfgGRPC.listeners = append(c.cfgGRPC.listeners, lis)
+		c.cfgGRPC.endpoints = append(c.cfgGRPC.endpoints, sc.Endpoint())
 
 		srv := grpc.NewServer(serverOpts...)
 
@@ -96,21 +99,23 @@ func serveGRPC(c *cfg) {
 
 		srv := c.cfgGRPC.servers[i]
 		lis := c.cfgGRPC.listeners[i]
+		endpoint := c.cfgGRPC.endpoints[i]
 
 		go func() {
 			defer func() {
 				c.log.Info(logs.FrostFSNodeStopListeningGRPCEndpoint,
-					zap.String("endpoint", lis.Addr().String()),
+					zap.Stringer("endpoint", lis.Addr()),
 				)
 
 				c.wg.Done()
 			}()
 
 			c.log.Info(logs.FrostFSNodeStartListeningGRPCEndpoint,
-				zap.String("endpoint", lis.Addr().String()),
+				zap.Stringer("endpoint", lis.Addr()),
 			)
 
 			if err := srv.Serve(lis); err != nil {
+				c.metricsCollector.GrpcServerMetrics().MarkUnhealthy(endpoint)
 				fmt.Println("gRPC server error", err)
 			}
 		}()

cmd/frostfs-node/keyspaceiterator.go

@@ -26,3 +26,7 @@ func (it *keySpaceIterator) Next(ctx context.Context, batchSize uint32) ([]objec
 	it.cur = res.Cursor()
 	return res.AddressList(), nil
 }
+
+func (it *keySpaceIterator) Rewind() {
+	it.cur = nil
+}

cmd/frostfs-node/main.go

@@ -84,6 +84,7 @@ func initApp(ctx context.Context, c *cfg) {
 		c.wg.Done()
 	}()
 
+	setRuntimeParameters(c)
 	metrics, _ := metricsComponent(c)
 	initAndLog(c, "profiler", initProfilerService)
 	initAndLog(c, metrics.name, metrics.init)

cmd/frostfs-node/netmap.go

@@ -227,6 +227,10 @@ func bootstrapNode(c *cfg) {
 			c.log.Info(logs.FrostFSNodeNodeIsUnderMaintenanceSkipInitialBootstrap)
 			return
 		}
+		if c.alreadyBootstraped {
+			c.log.Info(logs.NetmapNodeAlreadyInCandidateListOnlineSkipInitialBootstrap)
+			return
+		}
 		err := c.bootstrap()
 		fatalOnErrDetails("bootstrap error", err)
 	}
@@ -258,7 +262,8 @@ func initNetmapState(c *cfg) {
 	epoch, err := c.cfgNetmap.wrapper.Epoch()
 	fatalOnErrDetails("could not initialize current epoch number", err)
 
-	ni, err := c.netmapInitLocalNodeState(epoch)
+	var ni *netmapSDK.NodeInfo
+	ni, c.alreadyBootstraped, err = c.netmapInitLocalNodeState(epoch)
 	fatalOnErrDetails("could not init network state", err)
 
 	stateWord := nodeState(ni)
@@ -277,6 +282,13 @@ func initNetmapState(c *cfg) {
 	c.handleLocalNodeInfo(ni)
 }
 
+func sameNodeInfo(a, b *netmapSDK.NodeInfo) bool {
+	// Suboptimal, but we do this once on the node startup.
+	rawA := a.Marshal()
+	rawB := b.Marshal()
+	return bytes.Equal(rawA, rawB)
+}
+
 func nodeState(ni *netmapSDK.NodeInfo) string {
 	if ni != nil {
 		switch {
@@ -291,27 +303,29 @@ func nodeState(ni *netmapSDK.NodeInfo) string {
 	return "undefined"
 }
 
-func (c *cfg) netmapInitLocalNodeState(epoch uint64) (*netmapSDK.NodeInfo, error) {
+func (c *cfg) netmapInitLocalNodeState(epoch uint64) (*netmapSDK.NodeInfo, bool, error) {
 	nmNodes, err := c.cfgNetmap.wrapper.GetCandidates()
 	if err != nil {
-		return nil, err
+		return nil, false, err
 	}
 
 	var candidate *netmapSDK.NodeInfo
+	alreadyBootstraped := false
 	for i := range nmNodes {
 		if bytes.Equal(nmNodes[i].PublicKey(), c.binPublicKey) {
 			candidate = &nmNodes[i]
+			alreadyBootstraped = candidate.IsOnline() && sameNodeInfo(&c.cfgNodeInfo.localInfo, candidate)
 			break
 		}
 	}
 
 	node, err := c.netmapLocalNodeState(epoch)
 	if err != nil {
-		return nil, err
+		return nil, false, err
 	}
 
 	if candidate == nil {
-		return node, nil
+		return node, false, nil
 	}
 
 	nmState := nodeState(node)
@@ -319,11 +333,11 @@ func (c *cfg) netmapInitLocalNodeState(epoch uint64) (*netmapSDK.NodeInfo, error
 	if nmState != candidateState {
 		// This happens when the node was switched to maintenance without epoch tick.
 		// We expect it to continue staying in maintenance.
-		c.log.Info("candidate status is different from the netmap status, the former takes priority",
+		c.log.Info(logs.CandidateStatusPriority,
 			zap.String("netmap", nmState),
 			zap.String("candidate", candidateState))
 	}
-	return candidate, nil
+	return candidate, alreadyBootstraped, nil
 }
 
 func (c *cfg) netmapLocalNodeState(epoch uint64) (*netmapSDK.NodeInfo, error) {
@@ -463,8 +477,6 @@ func (n *netInfo) Dump(ver version.Version) (*netmapSDK.NetworkInfo, error) {
 		ni.SetMsPerBlock(msPerBlock)
 
 		ni.SetMaxObjectSize(netInfoMorph.MaxObjectSize)
-		ni.SetStoragePrice(netInfoMorph.StoragePrice)
-		ni.SetAuditFee(netInfoMorph.AuditFee)
 		ni.SetEpochDuration(netInfoMorph.EpochDuration)
 		ni.SetContainerFee(netInfoMorph.ContainerFee)
 		ni.SetNamedContainerFee(netInfoMorph.ContainerAliasFee)

cmd/frostfs-node/object.go

@@ -70,6 +70,10 @@ func (s *objectSvc) Put() (objectService.PutObjectStream, error) {
 	return s.put.Put()
 }
 
+func (s *objectSvc) PutSingle(ctx context.Context, req *object.PutSingleRequest) (*object.PutSingleResponse, error) {
+	return s.put.PutSingle(ctx, req)
+}
+
 func (s *objectSvc) Head(ctx context.Context, req *object.HeadRequest) (*object.HeadResponse, error) {
 	return s.get.Head(ctx, req)
 }
@@ -255,7 +259,6 @@ func addPolicer(c *cfg, keyStorage *util.KeyStorage, clientConstructor *cache.Cl
 		}),
 		policer.WithMaxCapacity(c.cfgObject.pool.replicatorPoolSize),
 		policer.WithPool(c.cfgObject.pool.replication),
-		policer.WithNodeLoader(c),
 	)
 
 	c.workers = append(c.workers, worker{
@@ -309,48 +312,40 @@ func createPutSvc(c *cfg, keyStorage *util.KeyStorage) *putsvc.Service {
 	}
 
 	return putsvc.NewService(
-		putsvc.WithKeyStorage(keyStorage),
-		putsvc.WithClientConstructor(c.putClientCache),
-		putsvc.WithMaxSizeSource(newCachedMaxObjectSizeSource(c)),
-		putsvc.WithObjectStorage(os),
-		putsvc.WithContainerSource(c.cfgObject.cnrSource),
-		putsvc.WithNetworkMapSource(c.netMapSource),
-		putsvc.WithNetmapKeys(c),
-		putsvc.WithNetworkState(c.cfgNetmap.state),
+		keyStorage,
+		c.putClientCache,
+		newCachedMaxObjectSizeSource(c),
+		os,
+		c.cfgObject.cnrSource,
+		c.netMapSource,
+		c,
+		c.cfgNetmap.state,
 		putsvc.WithWorkerPools(c.cfgObject.pool.putRemote, c.cfgObject.pool.putLocal),
 		putsvc.WithLogger(c.log),
 	)
 }
 
 func createPutSvcV2(sPut *putsvc.Service, keyStorage *util.KeyStorage) *putsvcV2.Service {
-	return putsvcV2.NewService(
-		putsvcV2.WithInternalService(sPut),
-		putsvcV2.WithKeyStorage(keyStorage),
-	)
+	return putsvcV2.NewService(sPut, keyStorage)
 }
 
 func createSearchSvc(c *cfg, keyStorage *util.KeyStorage, traverseGen *util.TraverserGenerator, coreConstructor *cache.ClientCache) *searchsvc.Service {
 	ls := c.cfgObject.cfgLocalStorage.localStorage
 
 	return searchsvc.New(
-		searchsvc.WithLogger(c.log),
-		searchsvc.WithLocalStorageEngine(ls),
-		searchsvc.WithClientConstructor(coreConstructor),
-		searchsvc.WithTraverserGenerator(
+		ls,
+		coreConstructor,
 		traverseGen.WithTraverseOptions(
 			placement.WithoutSuccessTracking(),
 		),
-		),
-		searchsvc.WithNetMapSource(c.netMapSource),
-		searchsvc.WithKeyStorage(keyStorage),
+		c.netMapSource,
+		keyStorage,
+		searchsvc.WithLogger(c.log),
 	)
 }
 
 func createSearchSvcV2(sSearch *searchsvc.Service, keyStorage *util.KeyStorage) *searchsvcV2.Service {
-	return searchsvcV2.NewService(
-		searchsvcV2.WithInternalService(sSearch),
-		searchsvcV2.WithKeyStorage(keyStorage),
-	)
+	return searchsvcV2.NewService(sSearch, keyStorage)
 }
 
 func createGetService(c *cfg, keyStorage *util.KeyStorage, traverseGen *util.TraverserGenerator,
@@ -378,24 +373,22 @@ func createGetServiceV2(sGet *getsvc.Service, keyStorage *util.KeyStorage) *gets
 func createDeleteService(c *cfg, keyStorage *util.KeyStorage, sGet *getsvc.Service,
 	sSearch *searchsvc.Service, sPut *putsvc.Service) *deletesvc.Service {
 	return deletesvc.New(
-		deletesvc.WithLogger(c.log),
-		deletesvc.WithHeadService(sGet),
-		deletesvc.WithSearchService(sSearch),
-		deletesvc.WithPutService(sPut),
-		deletesvc.WithNetworkInfo(&delNetInfo{
+		sGet,
+		sSearch,
+		sPut,
+		&delNetInfo{
 			State:      c.cfgNetmap.state,
 			tsLifetime: c.cfgObject.tombstoneLifetime,
 
 			cfg: c,
-		}),
-		deletesvc.WithKeyStorage(keyStorage),
+		},
+		keyStorage,
+		deletesvc.WithLogger(c.log),
 	)
 }
 
 func createDeleteServiceV2(sDelete *deletesvc.Service) *deletesvcV2.Service {
-	return deletesvcV2.NewService(
-		deletesvcV2.WithInternalService(sDelete),
-	)
+	return deletesvcV2.NewService(sDelete)
 }
 
 func createSplitService(c *cfg, sPutV2 *putsvcV2.Service, sGetV2 *getsvcV2.Service,
@@ -417,21 +410,16 @@ func createACLServiceV2(c *cfg, splitSvc *objectService.TransportSplitter) v2.Se
 	irFetcher := createInnerRingFetcher(c)
 
 	return v2.New(
-		v2.WithLogger(c.log),
-		v2.WithIRFetcher(newCachedIRFetcher(irFetcher)),
-		v2.WithNetmapSource(c.netMapSource),
-		v2.WithContainerSource(
+		splitSvc,
+		c.netMapSource,
+		newCachedIRFetcher(irFetcher),
+		acl.NewChecker(
+			c.cfgNetmap.state,
+			c.cfgObject.eaclSource,
+			eaclSDK.NewValidator(),
+			ls),
 		c.cfgObject.cnrSource,
-		),
-		v2.WithNextService(splitSvc),
-		v2.WithEACLChecker(
-			acl.NewChecker(new(acl.CheckerPrm).
-				SetNetmapState(c.cfgNetmap.state).
-				SetEACLSource(c.cfgObject.eaclSource).
-				SetValidator(eaclSDK.NewValidator()).
-				SetLocalStorage(ls),
-			),
-		),
+		v2.WithLogger(c.log),
 	)
 }
 

cmd/frostfs-node/runtime.go

@@ -0,0 +1,26 @@
+package main
+
+import (
+	"os"
+	"runtime/debug"
+
+	"git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/runtime"
+	"git.frostfs.info/TrueCloudLab/frostfs-node/internal/logs"
+	"go.uber.org/zap"
+)
+
+func setRuntimeParameters(c *cfg) {
+	if len(os.Getenv("GOMEMLIMIT")) != 0 {
+		// default limit < yaml limit < app env limit < GOMEMLIMIT
+		c.log.Warn(logs.RuntimeSoftMemoryDefinedWithGOMEMLIMIT)
+		return
+	}
+
+	memLimitBytes := runtime.GCMemoryLimitBytes(c.appCfg)
+	previous := debug.SetMemoryLimit(memLimitBytes)
+	if memLimitBytes != previous {
+		c.log.Info(logs.RuntimeSoftMemoryLimitUpdated,
+			zap.Int64("new_value", memLimitBytes),
+			zap.Int64("old_value", previous))
+	}
+}

config/example/node.env

@@ -36,6 +36,7 @@ FROSTFS_TREE_REPLICATION_CHANNEL_CAPACITY=32
 FROSTFS_TREE_REPLICATION_WORKER_COUNT=32
 FROSTFS_TREE_REPLICATION_TIMEOUT=5s
 FROSTFS_TREE_SYNC_INTERVAL=1h
+FROSTFS_TREE_AUTHORIZED_KEYS="0397d207ea77909f7d66fa6f36d08daae22ace672be7ea4f53513484dde8a142a0 02053819235c20d784132deba10bb3061629e3a5c819a039ef091841d9d35dad56"
 
 # gRPC section
 ## 0 server
@@ -187,3 +188,5 @@ FROSTFS_STORAGE_SHARD_1_GC_REMOVER_SLEEP_INTERVAL=5m
 FROSTFS_TRACING_ENABLED=true
 FROSTFS_TRACING_ENDPOINT="localhost"
 FROSTFS_TRACING_EXPORTER="otlp_grpc"
+
+FROSTFS_RUNTIME_SOFT_MEMORY_LIMIT=1073741824

config/example/node.json

@@ -75,7 +75,11 @@
     "replication_channel_capacity": 32,
     "replication_worker_count": 32,
     "replication_timeout": "5s",
-    "sync_interval": "1h"
+    "sync_interval": "1h",
+    "authorized_keys": [
+      "0397d207ea77909f7d66fa6f36d08daae22ace672be7ea4f53513484dde8a142a0",
+      "02053819235c20d784132deba10bb3061629e3a5c819a039ef091841d9d35dad56"
+    ]
   },
   "control": {
     "authorized_keys": [
@@ -190,6 +194,7 @@
         "resync_metabase": true,
         "writecache": {
           "enabled": true,
+          "type": "bbolt",
           "path": "tmp/1/cache",
           "memcache_capacity": 2147483648,
           "small_object_size": 16384,
@@ -241,5 +246,8 @@
     "enabled": true,
     "endpoint": "localhost:9090",
     "exporter": "otlp_grpc"
+  },
+  "runtime": {
+    "soft_memory_limit": 1073741824
   }
 }

config/example/node.yaml

@@ -62,6 +62,9 @@ tree:
   replication_channel_capacity: 32
   replication_timeout: 5s
   sync_interval: 1h
+  authorized_keys:  # list of hex-encoded public keys that have rights to use the Tree Service with frostfs-cli
+    - 0397d207ea77909f7d66fa6f36d08daae22ace672be7ea4f53513484dde8a142a0
+    - 02053819235c20d784132deba10bb3061629e3a5c819a039ef091841d9d35dad56
 
 control:
   authorized_keys:  # list of hex-encoded public keys that have rights to use the Control Service
@@ -119,6 +122,7 @@ storage:
 
       writecache:
         enabled: true
+        type: bbolt
         small_object_size: 16k  # size threshold for "small" objects which are cached in key-value DB, not in FS, bytes
         max_object_size: 134217728  # size threshold for "big" objects which bypass write-cache and go to the storage directly, bytes
         workers_number: 30  # number of write-cache flusher threads
@@ -214,3 +218,6 @@ tracing:
   enabled: true
   exporter: "otlp_grpc"
   endpoint: "localhost"
+
+runtime:
+  soft_memory_limit: 1gb

debian/rules

@@ -12,8 +12,8 @@ override_dh_auto_install:
 	echo $(DEB_BUILD_OPTIONS)
 	dh_auto_install
 
-	bin/frostfs-adm gendoc -t man man/
-	bin/frostfs-cli gendoc -t man man/
+	bin/frostfs-adm gendoc --type man man/
+	bin/frostfs-cli gendoc --type man man/
 
 	bin/frostfs-adm completion bash > debian/frostfs-adm.bash-completion
 	bin/frostfs-cli completion bash > debian/frostfs-cli.bash-completion

docs/storage-node-configuration.md

@@ -24,6 +24,7 @@ There are some custom types used for brevity:
 | `policer`    | [Policer service configuration](#policer-section)       |
 | `replicator` | [Replicator service configuration](#replicator-section) |
 | `storage`    | [Storage engine configuration](#storage-section)        |
+| `runtime`    | [Runtime configuration](#runtime-section)               |
 
 
 # `control` section
@@ -272,6 +273,7 @@ metabase:
 ```yaml
 writecache:
   enabled: true
+  type: bbolt
   path: /path/to/writecache
   capacity: 4294967296
   small_object_size: 16384
@@ -281,6 +283,7 @@ writecache:
 
 | Parameter            | Type       | Default value | Description                                                                                                          |
 |----------------------|------------|---------------|----------------------------------------------------------------------------------------------------------------------|
+| `type`               | `string`   |               | Type of write cache backing implementation to use (`bbolt`, `badger`).                                               |
 | `path`               | `string`   |               | Path to the metabase file.                                                                                           |
 | `capacity`           | `size`     | unrestricted  | Approximate maximum size of the writecache. If the writecache is full, objects are written to the blobstor directly. |
 | `small_object_size`  | `size`     | `32K`         | Maximum object size for "small" objects. This objects are stored in a key-value database instead of a file-system.   |
@@ -426,3 +429,15 @@ object:
 | `delete.tombstone_lifetime` | `int` | `5`           | Tombstone lifetime for removed objects in epochs.                                              |
 | `put.pool_size_remote`      | `int` | `10`          | Max pool size for performing remote `PUT` operations. Used by Policer and Replicator services. |
 | `put.pool_size_local`       | `int` | `10`          | Max pool size for performing local `PUT` operations. Used by Policer and Replicator services.  |
+
+# `runtime` section
+Contains runtime parameters.
+
+```yaml
+runtime:
+  soft_memory_limit: 1GB
+```
+
+| Parameter           | Type   | Default value | Description                                                              |
+|---------------------|--------|---------------|--------------------------------------------------------------------------|
+| `soft_memory_limit` | `size` | 0             | Soft memory limit for the runtime. Zero or no value stands for no limit. If `GOMEMLIMIT` environment variable is set, the value from the configuration file will be ignored. |

go.mod

@@ -1,12 +1,12 @@
 module git.frostfs.info/TrueCloudLab/frostfs-node
 
-go 1.19
+go 1.20
 
 require (
-	git.frostfs.info/TrueCloudLab/frostfs-api-go/v2 v2.15.1-0.20230602142716-68021b910acb
+	git.frostfs.info/TrueCloudLab/frostfs-api-go/v2 v2.15.1-0.20230802075510-964c3edb3f44
 	git.frostfs.info/TrueCloudLab/frostfs-contract v0.0.0-20230627134746-36f3d39c406a
 	git.frostfs.info/TrueCloudLab/frostfs-observability v0.0.0-20230531082742-c97d21411eb6
-	git.frostfs.info/TrueCloudLab/frostfs-sdk-go v0.0.0-20230628121302-5d62cef27e6c
+	git.frostfs.info/TrueCloudLab/frostfs-sdk-go v0.0.0-20230809065235-d48788c7a946
 	git.frostfs.info/TrueCloudLab/hrw v1.2.1
 	git.frostfs.info/TrueCloudLab/tzhash v1.8.0
 	github.com/cheggaaa/pb v1.0.29
@@ -41,6 +41,17 @@ require (
 	gopkg.in/yaml.v3 v3.0.1
 )
 
+require (
+	github.com/dgraph-io/ristretto v0.1.1 // indirect
+	github.com/dustin/go-humanize v1.0.0 // indirect
+	github.com/gogo/protobuf v1.3.2 // indirect
+	github.com/golang/glog v1.1.0 // indirect
+	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
+	github.com/google/flatbuffers v1.12.1 // indirect
+	github.com/pkg/errors v0.9.1 // indirect
+	go.opencensus.io v0.24.0 // indirect
+)
+
 require (
 	git.frostfs.info/TrueCloudLab/frostfs-crypto v0.6.0 // indirect
 	git.frostfs.info/TrueCloudLab/rfc6979 v0.4.0 // indirect
@@ -55,6 +66,7 @@ require (
 	github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 // indirect
+	github.com/dgraph-io/badger/v4 v4.1.0
 	github.com/fsnotify/fsnotify v1.6.0 // indirect
 	github.com/go-logr/logr v1.2.4 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect

internal/logs/logs.go

@@ -52,7 +52,6 @@ const (
 	PolicerRoutineStopped                                                   = "routine stopped"                                                           // Info in ../node/pkg/services/policer/process.go
 	PolicerFailureAtObjectSelectForReplication                              = "failure at object select for replication"                                  // Warn in ../node/pkg/services/policer/process.go
 	PolicerPoolSubmission                                                   = "pool submission"                                                           // Warn in ../node/pkg/services/policer/process.go
-	PolicerTuneReplicationCapacity                                          = "tune replication capacity"                                                 // Debug in ../node/pkg/services/policer/process.go
 	ReplicatorFinishWork                                                    = "finish work"                                                               // Debug in ../node/pkg/services/replicator/process.go
 	ReplicatorCouldNotGetObjectFromLocalStorage                             = "could not get object from local storage"                                   // Error in ../node/pkg/services/replicator/process.go
 	ReplicatorCouldNotReplicateObject                                       = "could not replicate object"                                                // Error in ../node/pkg/services/replicator/process.go
@@ -292,6 +291,7 @@ const (
 	ShardFailureToMarkLockersAsGarbage                                      = "failure to mark lockers as garbage"                                        // Warn in ../node/pkg/local_object_storage/shard/gc.go
 	ShardFailureToGetExpiredUnlockedObjects                                 = "failure to get expired unlocked objects"                                   // Warn in ../node/pkg/local_object_storage/shard/gc.go
 	ShardCouldNotMarkObjectToDeleteInMetabase                               = "could not mark object to delete in metabase"                               // Debug in ../node/pkg/local_object_storage/shard/inhume.go
+	WritecacheBadgerInitExperimental                                        = "initializing badger-backed experimental writecache"
 	WritecacheTriedToFlushItemsFromWritecache                               = "tried to flush items from write-cache"       // Debug in ../node/pkg/local_object_storage/writecache/flush.go
 	WritecacheWaitingForChannelsToFlush                                     = "waiting for channels to flush"               // Info in ../node/pkg/local_object_storage/writecache/mode.go
 	WritecacheFillingFlushMarksForObjectsInFSTree                           = "filling flush marks for objects in FSTree"   // Info in ../node/pkg/local_object_storage/writecache/init.go
@@ -301,6 +301,7 @@ const (
 	WritecacheCantRemoveObjectsFromTheDatabase                              = "can't remove objects from the database"      // Error in ../node/pkg/local_object_storage/writecache/storage.go
 	WritecacheCantParseAddress                                              = "can't parse address"                         // Error in ../node/pkg/local_object_storage/writecache/storage.go
 	WritecacheCantRemoveObjectFromWritecache                                = "can't remove object from write-cache"        // Error in ../node/pkg/local_object_storage/writecache/storage.go
+	WritecacheDBValueLogGCRunCompleted                                      = "value log GC run completed"
 	BlobovniczatreeCouldNotGetObjectFromLevel                               = "could not get object from level"                                     // Debug in ../node/pkg/local_object_storage/blobstor/blobovniczatree/get_range.go
 	BlobovniczatreeCouldNotReadPayloadRangeFromOpenedBlobovnicza            = "could not read payload range from opened blobovnicza"                // Debug in ../node/pkg/local_object_storage/blobstor/blobovniczatree/get_range.go
 	BlobovniczatreeCouldNotReadPayloadRangeFromActiveBlobovnicza            = "could not read payload range from active blobovnicza"                // Debug in ../node/pkg/local_object_storage/blobstor/blobovniczatree/get_range.go
@@ -408,7 +409,7 @@ const (
 	NetmapCantInvokeNetmapAddPeer                                           = "can't invoke netmap.AddPeer"                                         // Error in ../node/pkg/innerring/processors/netmap/process_peers.go
 	NetmapNonAlphabetModeIgnoreUpdatePeerNotification                       = "non alphabet mode, ignore update peer notification"                  // Info in ../node/pkg/innerring/processors/netmap/process_peers.go
 	NetmapPreventSwitchingNodeToMaintenanceState                            = "prevent switching node to maintenance state"                         // Info in ../node/pkg/innerring/processors/netmap/process_peers.go
-	NetmapCantInvokeNetmapUpdatePeer                                        = "can't invoke netmap.UpdatePeer"                                            // Error in ../node/pkg/innerring/processors/netmap/process_peers.go                                                 // Debug in ../node/pkg/innerring/processors/reputation/processor.go
+	NetmapCantInvokeNetmapUpdatePeer                                        = "can't invoke netmap.UpdatePeer"                                      // Error in ../node/pkg/innerring/processors/netmap/process_peers.go
 	FrostFSIRInternalError                                                  = "internal error"                                                      // Info in ../node/cmd/frostfs-ir/main.go
 	FrostFSIRCouldNotShutdownHTTPServer                                     = "could not shutdown HTTP server"                                      // Debug in ../node/cmd/frostfs-ir/main.go
 	FrostFSIRApplicationStopped                                             = "application stopped"                                                 // Info in ../node/cmd/frostfs-ir/main.go
@@ -493,4 +494,24 @@ const (
 	ShardDeleteCantDeleteFromWriteCache                                     = "can't delete object from write cache"
 	FrostFSNodeNodeIsUnderMaintenanceSkipInitialBootstrap                   = "the node is under maintenance, skip initial bootstrap"
 	EngineCouldNotChangeShardModeToDisabled                                 = "could not change shard mode to disabled"
+	NetmapNodeAlreadyInCandidateListOnlineSkipInitialBootstrap              = "the node is already in candidate list with online state, skip initial bootstrap"
+	RPConnectionLost                                                        = "RPC connection lost, attempting reconnect"
+	RPCNodeSwitchFailure                                                    = "can't switch RPC node"
+	FSTreeCantReadFile                                                      = "can't read a file"
+	FSTreeCantUnmarshalObject                                               = "can't unmarshal an object"
+	FSTreeCantFushObjectBlobstor                                            = "can't flush an object to blobstor"
+	FSTreeCantUpdateID                                                      = "can't update object storage ID"
+	FSTreeCantDecodeDBObjectAddress                                         = "can't decode object address from the DB"
+	PutSingleRedirectFailure                                                = "failed to redirect PutSingle request"
+	StorageIDRetrievalFailure                                               = "can't get storage ID from metabase"
+	ObjectRemovalFailureBlobStor                                            = "can't remove object from blobStor"
+	CandidateStatusPriority                                                 = "candidate status is different from the netmap status, the former takes priority"
+	TombstoneExpirationParseFailure                                         = "tombstone getter: could not parse tombstone expiration epoch"
+	FrostFSNodeCantUpdateObjectStorageID                                    = "can't update object storage ID"
+	FrostFSNodeCantFlushObjectToBlobstor                                    = "can't flush an object to blobstor"
+	FrostFSNodeCantDecodeObjectAddressFromDB                                = "can't decode object address from the DB" // Error in ../node/cmd/frostfs-node/morph.go
+	FrostFSNodeCantUnmarshalObjectFromDB                                    = "can't unmarshal an object from the DB"   // Error in ../node/cmd/frostfs-node/morph.go
+	RuntimeSoftMemoryLimitUpdated                                           = "soft runtime memory limit value updated"
+	RuntimeSoftMemoryDefinedWithGOMEMLIMIT                                  = "soft runtime memory defined with GOMEMLIMIT environment variable, config value skipped"
+	FailedToCountWritecacheItems                                            = "failed to count writecache items"
 )

pkg/core/client/client.go

@@ -13,6 +13,7 @@ import (
 type Client interface {
 	ContainerAnnounceUsedSpace(context.Context, client.PrmAnnounceSpace) (*client.ResAnnounceSpace, error)
 	ObjectPutInit(context.Context, client.PrmObjectPutInit) (client.ObjectWriter, error)
+	ObjectPutSingle(context.Context, client.PrmObjectPutSingle) (*client.ResObjectPutSingle, error)
 	ObjectDelete(context.Context, client.PrmObjectDelete) (*client.ResObjectDelete, error)
 	ObjectGetInit(context.Context, client.PrmObjectGet) (*client.ObjectReader, error)
 	ObjectHead(context.Context, client.PrmObjectHead) (*client.ResObjectHead, error)

pkg/core/container/storage.go

@@ -1,9 +1,6 @@
 package container
 
 import (
-	"errors"
-
-	apistatus "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client/status"
 	"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container"
 	cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id"
 	frostfscrypto "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/crypto"
@@ -37,12 +34,6 @@ type Source interface {
 	Get(cid.ID) (*Container, error)
 }
 
-// IsErrNotFound checks if the error returned by Source.Get corresponds
-// to the missing container.
-func IsErrNotFound(err error) bool {
-	return errors.As(err, new(apistatus.ContainerNotFound))
-}
-
 // EACL groups information about the FrostFS container's extended ACL stored in
 // the FrostFS network.
 type EACL struct {

pkg/core/object/address.go

@@ -1,7 +1,7 @@
 package object
 
 import (
-	"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object"
+	objectSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object"
 	oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id"
 )
 
@@ -9,5 +9,5 @@ import (
 // object type.
 type AddressWithType struct {
 	Address oid.Address
-	Type    object.Type
+	Type    objectSDK.Type
 }

pkg/core/object/fmt.go

@@ -12,7 +12,7 @@ import (
 	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/netmap"
 	cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id"
 	frostfsecdsa "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/crypto/ecdsa"
-	"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object"
+	objectSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object"
 	oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id"
 	"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/user"
 )
@@ -64,6 +64,8 @@ var errNoExpirationEpoch = errors.New("missing expiration epoch attribute")
 
 var errTombstoneExpiration = errors.New("tombstone body and header contain different expiration values")
 
+var errMissingSignature = errors.New("missing signature")
+
 func defaultCfg() *cfg {
 	return new(cfg)
 }
@@ -87,7 +89,7 @@ func NewFormatValidator(opts ...FormatValidatorOption) *FormatValidator {
 // If unprepared is true, only fields set by user are validated.
 //
 // Returns nil error if the object has valid structure.
-func (v *FormatValidator) Validate(ctx context.Context, obj *object.Object, unprepared bool) error {
+func (v *FormatValidator) Validate(ctx context.Context, obj *objectSDK.Object, unprepared bool) error {
 	if obj == nil {
 		return errNilObject
 	}
@@ -119,7 +121,7 @@ func (v *FormatValidator) Validate(ctx context.Context, obj *object.Object, unpr
 			return fmt.Errorf("object did not pass expiration check: %w", err)
 		}
 
-		if err := object.CheckHeaderVerificationFields(obj); err != nil {
+		if err := objectSDK.CheckHeaderVerificationFields(obj); err != nil {
 			return fmt.Errorf("(%T) could not validate header fields: %w", v, err)
 		}
 	}
@@ -132,11 +134,10 @@ func (v *FormatValidator) Validate(ctx context.Context, obj *object.Object, unpr
 	return nil
 }
 
-func (v *FormatValidator) validateSignatureKey(obj *object.Object) error {
+func (v *FormatValidator) validateSignatureKey(obj *objectSDK.Object) error {
 	sig := obj.Signature()
 	if sig == nil {
-		// TODO(@cthulhu-rider): #468 use "const" error
-		return errors.New("missing signature")
+		return errMissingSignature
 	}
 
 	var sigV2 refs.Signature
@@ -157,8 +158,6 @@ func (v *FormatValidator) validateSignatureKey(obj *object.Object) error {
 		return v.checkOwnerKey(*obj.OwnerID(), key)
 	}
 
-	// FIXME: #1159 perform token verification
-
 	return nil
 }
 
@@ -178,13 +177,13 @@ func (v *FormatValidator) checkOwnerKey(id user.ID, key frostfsecdsa.PublicKey)
 //   - object.TypeTombstone;
 //   - object.TypeLock.
 type ContentMeta struct {
-	typ object.Type
+	typ objectSDK.Type
 
 	objs []oid.ID
 }
 
 // Type returns object's type.
-func (i ContentMeta) Type() object.Type {
+func (i ContentMeta) Type() objectSDK.Type {
 	return i.typ
 }
 
@@ -197,17 +196,17 @@ func (i ContentMeta) Objects() []oid.ID {
 }
 
 // ValidateContent validates payload content according to the object type.
-func (v *FormatValidator) ValidateContent(o *object.Object) (ContentMeta, error) {
+func (v *FormatValidator) ValidateContent(o *objectSDK.Object) (ContentMeta, error) {
 	meta := ContentMeta{
 		typ: o.Type(),
 	}
 
 	switch o.Type() {
-	case object.TypeTombstone:
+	case objectSDK.TypeTombstone:
 		if err := v.fillAndValidateTombstoneMeta(o, &meta); err != nil {
 			return ContentMeta{}, err
 		}
-	case object.TypeLock:
+	case objectSDK.TypeLock:
 		if err := v.fillAndValidateLockMeta(o, &meta); err != nil {
 			return ContentMeta{}, err
 		}
@@ -218,7 +217,7 @@ func (v *FormatValidator) ValidateContent(o *object.Object) (ContentMeta, error)
 	return meta, nil
 }
 
-func (v *FormatValidator) fillAndValidateLockMeta(o *object.Object, meta *ContentMeta) error {
+func (v *FormatValidator) fillAndValidateLockMeta(o *objectSDK.Object, meta *ContentMeta) error {
 	if len(o.Payload()) == 0 {
 		return errors.New("empty payload in lock")
 	}
@@ -240,7 +239,7 @@ func (v *FormatValidator) fillAndValidateLockMeta(o *object.Object, meta *Conten
 		return fmt.Errorf("lock object expiration: %d; current: %d", lockExp, currEpoch)
 	}
 
-	var lock object.Lock
+	var lock objectSDK.Lock
 
 	if err = lock.Unmarshal(o.Payload()); err != nil {
 		return fmt.Errorf("decode lock payload: %w", err)
@@ -256,12 +255,12 @@ func (v *FormatValidator) fillAndValidateLockMeta(o *object.Object, meta *Conten
 	return nil
 }
 
-func (v *FormatValidator) fillAndValidateTombstoneMeta(o *object.Object, meta *ContentMeta) error {
+func (v *FormatValidator) fillAndValidateTombstoneMeta(o *objectSDK.Object, meta *ContentMeta) error {
 	if len(o.Payload()) == 0 {
 		return fmt.Errorf("(%T) empty payload in tombstone", v)
 	}
 
-	tombstone := object.NewTombstone()
+	tombstone := objectSDK.NewTombstone()
 
 	if err := tombstone.Unmarshal(o.Payload()); err != nil {
 		return fmt.Errorf("(%T) could not unmarshal tombstone content: %w", v, err)
@@ -287,7 +286,7 @@ func (v *FormatValidator) fillAndValidateTombstoneMeta(o *object.Object, meta *C
 
 var errExpired = errors.New("object has expired")
 
-func (v *FormatValidator) checkExpiration(ctx context.Context, obj *object.Object) error {
+func (v *FormatValidator) checkExpiration(ctx context.Context, obj *objectSDK.Object) error {
 	exp, err := expirationEpochAttribute(obj)
 	if err != nil {
 		if errors.Is(err, errNoExpirationEpoch) {
@@ -321,7 +320,7 @@ func (v *FormatValidator) checkExpiration(ctx context.Context, obj *object.Objec
 	return nil
 }
 
-func expirationEpochAttribute(obj *object.Object) (uint64, error) {
+func expirationEpochAttribute(obj *objectSDK.Object) (uint64, error) {
 	for _, a := range obj.Attributes() {
 		if a.Key() != objectV2.SysAttributeExpEpoch && a.Key() != objectV2.SysAttributeExpEpochNeoFS {
 			continue
@@ -338,7 +337,7 @@ var (
 	errEmptyAttrVal = errors.New("empty attribute value")
 )
 
-func (v *FormatValidator) checkAttributes(obj *object.Object) error {
+func (v *FormatValidator) checkAttributes(obj *objectSDK.Object) error {
 	as := obj.Attributes()
 
 	mUnique := make(map[string]struct{}, len(as))
@@ -362,7 +361,7 @@ func (v *FormatValidator) checkAttributes(obj *object.Object) error {
 
 var errIncorrectOwner = errors.New("incorrect object owner")
 
-func (v *FormatValidator) checkOwner(obj *object.Object) error {
+func (v *FormatValidator) checkOwner(obj *objectSDK.Object) error {
 	if idOwner := obj.OwnerID(); idOwner == nil || len(idOwner.WalletBytes()) == 0 {
 		return errIncorrectOwner
 	}

pkg/core/object/fmt_test.go

@@ -8,7 +8,7 @@ import (
 
 	objectV2 "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/object"
 	cidtest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id/test"
-	"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object"
+	objectSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object"
 	oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id"
 	oidtest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id/test"
 	sessiontest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/session/test"
@@ -17,11 +17,11 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
-func blankValidObject(key *ecdsa.PrivateKey) *object.Object {
+func blankValidObject(key *ecdsa.PrivateKey) *objectSDK.Object {
 	var idOwner user.ID
 	user.IDFromKey(&idOwner, key.PublicKey)
 
-	obj := object.New()
+	obj := objectSDK.New()
 	obj.SetContainerID(cidtest.ID())
 	obj.SetOwnerID(&idOwner)
 
@@ -66,20 +66,20 @@ func TestFormatValidator_Validate(t *testing.T) {
 	})
 
 	t.Run("nil identifier", func(t *testing.T) {
-		obj := object.New()
+		obj := objectSDK.New()
 
 		require.ErrorIs(t, v.Validate(context.Background(), obj, false), errNilID)
 	})
 
 	t.Run("nil container identifier", func(t *testing.T) {
-		obj := object.New()
+		obj := objectSDK.New()
 		obj.SetID(oidtest.ID())
 
 		require.ErrorIs(t, v.Validate(context.Background(), obj, true), errNilCID)
 	})
 
 	t.Run("unsigned object", func(t *testing.T) {
-		obj := object.New()
+		obj := objectSDK.New()
 		obj.SetContainerID(cidtest.ID())
 		obj.SetID(oidtest.ID())
 
@@ -94,12 +94,12 @@ func TestFormatValidator_Validate(t *testing.T) {
 		err := tok.Sign(ownerKey.PrivateKey)
 		require.NoError(t, err)
 
-		obj := object.New()
+		obj := objectSDK.New()
 		obj.SetContainerID(cidtest.ID())
 		obj.SetSessionToken(tok)
 		obj.SetOwnerID(&idOwner)
 
-		require.NoError(t, object.SetIDWithSignature(ownerKey.PrivateKey, obj))
+		require.NoError(t, objectSDK.SetIDWithSignature(ownerKey.PrivateKey, obj))
 
 		require.NoError(t, v.Validate(context.Background(), obj, false))
 	})
@@ -107,20 +107,20 @@ func TestFormatValidator_Validate(t *testing.T) {
 	t.Run("correct w/o session token", func(t *testing.T) {
 		obj := blankValidObject(&ownerKey.PrivateKey)
 
-		require.NoError(t, object.SetIDWithSignature(ownerKey.PrivateKey, obj))
+		require.NoError(t, objectSDK.SetIDWithSignature(ownerKey.PrivateKey, obj))
 
 		require.NoError(t, v.Validate(context.Background(), obj, false))
 	})
 
 	t.Run("tombstone content", func(t *testing.T) {
-		obj := object.New()
-		obj.SetType(object.TypeTombstone)
+		obj := objectSDK.New()
+		obj.SetType(objectSDK.TypeTombstone)
 		obj.SetContainerID(cidtest.ID())
 
 		_, err := v.ValidateContent(obj)
 		require.Error(t, err) // no tombstone content
 
-		content := object.NewTombstone()
+		content := objectSDK.NewTombstone()
 		content.SetMembers([]oid.ID{oidtest.ID()})
 
 		data, err := content.Marshal()
@@ -141,7 +141,7 @@ func TestFormatValidator_Validate(t *testing.T) {
 		_, err = v.ValidateContent(obj)
 		require.Error(t, err) // no expiration epoch in tombstone
 
-		var expirationAttribute object.Attribute
+		var expirationAttribute objectSDK.Attribute
 		expirationAttribute.SetKey(objectV2.SysAttributeExpEpoch)
 		expirationAttribute.SetValue(strconv.Itoa(10))
 
@@ -163,20 +163,20 @@ func TestFormatValidator_Validate(t *testing.T) {
 		require.NoError(t, err) // all good
 
 		require.EqualValues(t, []oid.ID{id}, contentGot.Objects())
-		require.Equal(t, object.TypeTombstone, contentGot.Type())
+		require.Equal(t, objectSDK.TypeTombstone, contentGot.Type())
 	})
 
 	t.Run("expiration", func(t *testing.T) {
-		fn := func(val string) *object.Object {
+		fn := func(val string) *objectSDK.Object {
 			obj := blankValidObject(&ownerKey.PrivateKey)
 
-			var a object.Attribute
+			var a objectSDK.Attribute
 			a.SetKey(objectV2.SysAttributeExpEpoch)
 			a.SetValue(val)
 
 			obj.SetAttributes(a)
 
-			require.NoError(t, object.SetIDWithSignature(ownerKey.PrivateKey, obj))
+			require.NoError(t, objectSDK.SetIDWithSignature(ownerKey.PrivateKey, obj))
 
 			return obj
 		}
@@ -221,11 +221,11 @@ func TestFormatValidator_Validate(t *testing.T) {
 		t.Run("duplication", func(t *testing.T) {
 			obj := blankValidObject(&ownerKey.PrivateKey)
 
-			var a1 object.Attribute
+			var a1 objectSDK.Attribute
 			a1.SetKey("key1")
 			a1.SetValue("val1")
 
-			var a2 object.Attribute
+			var a2 objectSDK.Attribute
 			a2.SetKey("key2")
 			a2.SetValue("val2")
 
@@ -244,7 +244,7 @@ func TestFormatValidator_Validate(t *testing.T) {
 		t.Run("empty value", func(t *testing.T) {
 			obj := blankValidObject(&ownerKey.PrivateKey)
 
-			var a object.Attribute
+			var a objectSDK.Attribute
 			a.SetKey("key")
 
 			obj.SetAttributes(a)

pkg/core/object/object.go

@@ -1,12 +1,12 @@
 package object
 
 import (
-	"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object"
+	objectSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object"
 	oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id"
 )
 
 // AddressOf returns the address of the object.
-func AddressOf(obj *object.Object) oid.Address {
+func AddressOf(obj *objectSDK.Object) oid.Address {
 	var addr oid.Address
 
 	id, ok := obj.ID()

pkg/innerring/contracts_test.go

@@ -16,7 +16,6 @@ func TestParseContractsSuccess(t *testing.T) {
 contracts:
  frostfs: ee3dee6d05dc79c24a5b8f6985e10d68b7cacc62
  processing: 597f5894867113a41e192801709c02497f611de8
- audit: 219e37aed2180b87e7fe945dbf97d67125e8d73f
  balance: d2aa48d14b17b11bc4c68205027884a96706dd16
  container: ed4a7a66fe3f9bfe50f214b49be8f215a3c886b6
  frostfsid: 9f5866decbc751a099e74c7c7bc89f609201755a
@@ -138,13 +137,12 @@ contracts:
 
 func TestParseContractsInvalid(t *testing.T) {
 	t.Parallel()
-	t.Run("invalid audit contract", func(t *testing.T) {
+	t.Run("invalid frostfs contract", func(t *testing.T) {
 		t.Parallel()
 		file := strings.NewReader(`
 contracts:
  frostfs: invalid_data
  processing: 597f5894867113a41e192801709c02497f611de8
- audit: 219e37aed2180b87e7fe945dbf97d67125e8d73f
  balance: d2aa48d14b17b11bc4c68205027884a96706dd16
  container: ed4a7a66fe3f9bfe50f214b49be8f215a3c886b6
  frostfsid: 9f5866decbc751a099e74c7c7bc89f609201755a
@@ -171,7 +169,6 @@ contracts:
 contracts:
  frostfs: ee3dee6d05dc79c24a5b8f6985e10d68b7cacc62
  processing: 597f5894867113a41e192801709c02497f611de8
- audit: 219e37aed2180b87e7fe945dbf97d67125e8d73f
  balance: d2aa48d14b17b11bc4c68205027884a96706dd16
  container: ed4a7a66fe3f9bfe50f214b49be8f215a3c886b6
  frostfsid: 9f5866decbc751a099e74c7c7bc89f609201755a

pkg/innerring/initialization.go

@@ -246,11 +246,7 @@ func (s *Server) initAlphabetProcessor(cfg *viper.Viper) error {
 	}
 
 	err = bindMorphProcessor(s.alphabetProcessor, s)
-	if err != nil {
 	return err
-	}
-
-	return nil
 }
 
 func (s *Server) initContainerProcessor(cfg *viper.Viper, cnrClient *container.Client,
@@ -454,11 +450,7 @@ func (s *Server) initProcessors(cfg *viper.Viper, morphClients *serverMorphClien
 	}
 
 	err = s.initAlphabetProcessor(cfg)
-	if err != nil {
 	return err
-	}
-
-	return nil
 }
 
 func (s *Server) initMorph(ctx context.Context, cfg *viper.Viper, errChan chan<- error) (*chainParams, error) {

pkg/innerring/processors/container/handlers_test.go

@@ -282,7 +282,7 @@ func (c *testContainerClient) Get(cid []byte) (*containercore.Container, error)
 	if cont, found := c.get[key]; found {
 		return cont, nil
 	}
-	return nil, apistatus.ContainerNotFound{}
+	return nil, new(apistatus.ContainerNotFound)
 }
 
 type testIDClient struct {

pkg/innerring/processors/frostfs/process_assets.go

@@ -45,7 +45,7 @@ func (np *Processor) processDeposit(deposit frostfsEvent.Deposit) bool {
 	val, ok := np.mintEmitCache.Get(receiver.String())
 	if ok && val+np.mintEmitThreshold >= curEpoch {
 		np.log.Warn(logs.FrostFSDoubleMintEmissionDeclined,
-			zap.String("receiver", receiver.String()),
+			zap.Stringer("receiver", receiver),
 			zap.Uint64("last_emission", val),
 			zap.Uint64("current_epoch", curEpoch))
 

pkg/innerring/processors/governance/list_test.go

@@ -60,8 +60,7 @@ func TestNewAlphabetList(t *testing.T) {
 		orig := keys.PublicKeys{k[1], k[2], k[3], k[4]}
 		main := keys.PublicKeys{k[1], k[2], k[5], k[4]}
 
-		exp := make(keys.PublicKeys, len(main))
-		copy(exp, main)
+		exp := main.Copy()
 		sort.Sort(exp)
 
 		got, err := newAlphabetList(orig, main)