.forgejo/workflows/oci-image.yml

@@ -1,28 +0,0 @@
-name: OCI image
-
-on:
-  push:
-  workflow_dispatch:
-
-jobs:
-  image:
-    name: Build container images
-    runs-on: docker
-    container: git.frostfs.info/truecloudlab/env:oci-image-builder-bookworm
-    steps:
-      - name: Clone git repo
-        uses: actions/checkout@v3
-
-      - name: Build OCI image
-        run: make images
-
-      - name: Push image to OCI registry
-        run: |
-          echo "$REGISTRY_PASSWORD" \
-            | docker login --username truecloudlab --password-stdin git.frostfs.info
-          make push-images
-        if: >-
-          startsWith(github.ref, 'refs/tags/v') &&
-          (github.event_name == 'workflow_dispatch' || github.event_name == 'push')
-        env:
-          REGISTRY_PASSWORD: ${{secrets.FORGEJO_OCI_REGISTRY_PUSH_TOKEN}}

.golangci.yml

@@ -89,7 +89,5 @@ linters:
     - protogetter
     - intrange
     - tenv
-    - unconvert
-    - unparam
   disable-all: true
   fast: false

Makefile

@@ -139,15 +139,6 @@ images: image-storage image-ir image-cli image-adm
 # Build dirty local Docker images
 dirty-images: image-dirty-storage image-dirty-ir image-dirty-cli image-dirty-adm
 
-# Push FrostFS components' docker image to the registry
-push-image-%:
-	@echo "⇒ Publish FrostFS $* docker image "
-	@docker push $(HUB_IMAGE)-$*:$(HUB_TAG)
-
-# Push all Docker images to the registry
-.PHONY: push-images
-push-images: push-image-storage push-image-ir push-image-cli push-image-adm
-
 # Run `make %` in Golang container
 docker/%:
 	docker run --rm -t \
@@ -279,12 +270,10 @@ env-up: all
 		echo "Frostfs contracts not found"; exit 1; \
 	fi
 	${BIN}/frostfs-adm --config ./dev/adm/frostfs-adm.yml morph init --contracts ${FROSTFS_CONTRACTS_PATH}
-	${BIN}/frostfs-adm --config ./dev/adm/frostfs-adm.yml morph refill-gas --gas 10.0 \
-		--storage-wallet ./dev/storage/wallet01.json \
-		--storage-wallet ./dev/storage/wallet02.json \
-		--storage-wallet ./dev/storage/wallet03.json \
-		--storage-wallet ./dev/storage/wallet04.json
-
+	${BIN}/frostfs-adm --config ./dev/adm/frostfs-adm.yml morph refill-gas --storage-wallet ./dev/storage/wallet01.json --gas 10.0
+	${BIN}/frostfs-adm --config ./dev/adm/frostfs-adm.yml morph refill-gas --storage-wallet ./dev/storage/wallet02.json --gas 10.0
+	${BIN}/frostfs-adm --config ./dev/adm/frostfs-adm.yml morph refill-gas --storage-wallet ./dev/storage/wallet03.json --gas 10.0
+	${BIN}/frostfs-adm --config ./dev/adm/frostfs-adm.yml morph refill-gas --storage-wallet ./dev/storage/wallet04.json --gas 10.0
 	@if [ ! -f "$(LOCODE_DB_PATH)" ]; then \
 		make locode-download; \
 	fi

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

@@ -253,7 +253,7 @@ func frostfsidListNamespaces(cmd *cobra.Command, _ []string) {
 	reader := frostfsidrpclient.NewReader(inv, hash)
 	sessionID, it, err := reader.ListNamespaces()
 	commonCmd.ExitOnErr(cmd, "can't get namespace: %w", err)
-	items, err := readIterator(inv, &it, sessionID)
+	items, err := readIterator(inv, &it, iteratorBatchSize, sessionID)
 	commonCmd.ExitOnErr(cmd, "can't read iterator: %w", err)
 
 	namespaces, err := frostfsidclient.ParseNamespaces(items)
@@ -305,7 +305,7 @@ func frostfsidListSubjects(cmd *cobra.Command, _ []string) {
 	sessionID, it, err := reader.ListNamespaceSubjects(ns)
 	commonCmd.ExitOnErr(cmd, "can't get namespace: %w", err)
 
-	subAddresses, err := frostfsidclient.UnwrapArrayOfUint160(readIterator(inv, &it, sessionID))
+	subAddresses, err := frostfsidclient.UnwrapArrayOfUint160(readIterator(inv, &it, iteratorBatchSize, sessionID))
 	commonCmd.ExitOnErr(cmd, "can't unwrap: %w", err)
 
 	sort.Slice(subAddresses, func(i, j int) bool { return subAddresses[i].Less(subAddresses[j]) })
@@ -319,7 +319,7 @@ func frostfsidListSubjects(cmd *cobra.Command, _ []string) {
 		sessionID, it, err := reader.ListSubjects()
 		commonCmd.ExitOnErr(cmd, "can't get subject: %w", err)
 
-		items, err := readIterator(inv, &it, sessionID)
+		items, err := readIterator(inv, &it, iteratorBatchSize, sessionID)
 		commonCmd.ExitOnErr(cmd, "can't read iterator: %w", err)
 
 		subj, err := frostfsidclient.ParseSubject(items)
@@ -365,7 +365,7 @@ func frostfsidListGroups(cmd *cobra.Command, _ []string) {
 	sessionID, it, err := reader.ListGroups(ns)
 	commonCmd.ExitOnErr(cmd, "can't get namespace: %w", err)
 
-	items, err := readIterator(inv, &it, sessionID)
+	items, err := readIterator(inv, &it, iteratorBatchSize, sessionID)
 	commonCmd.ExitOnErr(cmd, "can't list groups: %w", err)
 	groups, err := frostfsidclient.ParseGroups(items)
 	commonCmd.ExitOnErr(cmd, "can't parse groups: %w", err)
@@ -415,7 +415,7 @@ func frostfsidListGroupSubjects(cmd *cobra.Command, _ []string) {
 	sessionID, it, err := reader.ListGroupSubjects(ns, big.NewInt(groupID))
 	commonCmd.ExitOnErr(cmd, "can't list groups: %w", err)
 
-	items, err := readIterator(inv, &it, sessionID)
+	items, err := readIterator(inv, &it, iteratorBatchSize, sessionID)
 	commonCmd.ExitOnErr(cmd, "can't read iterator: %w", err)
 
 	subjects, err := frostfsidclient.UnwrapArrayOfUint160(items, err)
@@ -492,17 +492,17 @@ func (f *frostfsidClient) sendWaitRes() (*state.AppExecResult, error) {
 	return f.roCli.Wait(f.wCtx.SentTxs[0].Hash, f.wCtx.SentTxs[0].Vub, nil)
 }
 
-func readIterator(inv *invoker.Invoker, iter *result.Iterator, sessionID uuid.UUID) ([]stackitem.Item, error) {
+func readIterator(inv *invoker.Invoker, iter *result.Iterator, batchSize int, sessionID uuid.UUID) ([]stackitem.Item, error) {
 	var shouldStop bool
 	res := make([]stackitem.Item, 0)
 	for !shouldStop {
-		items, err := inv.TraverseIterator(sessionID, iter, iteratorBatchSize)
+		items, err := inv.TraverseIterator(sessionID, iter, batchSize)
 		if err != nil {
 			return nil, err
 		}
 
 		res = append(res, items...)
-		shouldStop = len(items) < iteratorBatchSize
+		shouldStop = len(items) < batchSize
 	}
 
 	return res, nil

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

@@ -12,6 +12,7 @@ import (
 	"git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-adm/internal/modules/morph/helper"
 	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/innerring"
 	"github.com/nspcc-dev/neo-go/pkg/crypto/keys"
+	"github.com/nspcc-dev/neo-go/pkg/encoding/address"
 	"github.com/nspcc-dev/neo-go/pkg/io"
 	"github.com/nspcc-dev/neo-go/pkg/rpcclient/gas"
 	"github.com/nspcc-dev/neo-go/pkg/smartcontract"
@@ -140,29 +141,60 @@ func addMultisigAccount(w *wallet.Wallet, m int, name, password string, pubs key
 }
 
 func generateStorageCreds(cmd *cobra.Command, _ []string) error {
-	walletPath, _ := cmd.Flags().GetString(commonflags.StorageWalletFlag)
-	w, err := wallet.NewWallet(walletPath)
-	if err != nil {
-		return fmt.Errorf("create wallet: %w", err)
-	}
-
-	label, _ := cmd.Flags().GetString(storageWalletLabelFlag)
-	password, err := config.GetStoragePassword(viper.GetViper(), label)
-	if err != nil {
-		return fmt.Errorf("can't fetch password: %w", err)
-	}
-
-	if label == "" {
-		label = constants.SingleAccountName
-	}
-
-	if err := w.CreateAccount(label, password); err != nil {
-		return fmt.Errorf("can't create account: %w", err)
-	}
-	return refillGas(cmd, storageGasConfigFlag, w.Accounts[0].ScriptHash())
+	return refillGas(cmd, storageGasConfigFlag, true)
 }
 
-func refillGas(cmd *cobra.Command, gasFlag string, gasReceivers ...util.Uint160) (err error) {
+func refillGas(cmd *cobra.Command, gasFlag string, createWallet bool) (err error) {
+	// storage wallet path is not part of the config
+	storageWalletPath, _ := cmd.Flags().GetString(commonflags.StorageWalletFlag)
+	// wallet address is not part of the config
+	walletAddress, _ := cmd.Flags().GetString(walletAddressFlag)
+
+	var gasReceiver util.Uint160
+
+	if len(walletAddress) != 0 {
+		gasReceiver, err = address.StringToUint160(walletAddress)
+		if err != nil {
+			return fmt.Errorf("invalid wallet address %s: %w", walletAddress, err)
+		}
+	} else {
+		if storageWalletPath == "" {
+			return fmt.Errorf("missing wallet path (use '--%s <out.json>')", commonflags.StorageWalletFlag)
+		}
+
+		var w *wallet.Wallet
+
+		if createWallet {
+			w, err = wallet.NewWallet(storageWalletPath)
+		} else {
+			w, err = wallet.NewWalletFromFile(storageWalletPath)
+		}
+
+		if err != nil {
+			return fmt.Errorf("can't create wallet: %w", err)
+		}
+
+		if createWallet {
+			var password string
+
+			label, _ := cmd.Flags().GetString(storageWalletLabelFlag)
+			password, err := config.GetStoragePassword(viper.GetViper(), label)
+			if err != nil {
+				return fmt.Errorf("can't fetch password: %w", err)
+			}
+
+			if label == "" {
+				label = constants.SingleAccountName
+			}
+
+			if err := w.CreateAccount(label, password); err != nil {
+				return fmt.Errorf("can't create account: %w", err)
+			}
+		}
+
+		gasReceiver = w.Accounts[0].Contract.ScriptHash()
+	}
+
 	gasStr := viper.GetString(gasFlag)
 
 	gasAmount, err := helper.ParseGASAmount(gasStr)
@@ -176,11 +208,9 @@ func refillGas(cmd *cobra.Command, gasFlag string, gasReceivers ...util.Uint160)
 	}
 
 	bw := io.NewBufBinWriter()
-	for _, gasReceiver := range gasReceivers {
-		emit.AppCall(bw.BinWriter, gas.Hash, "transfer", callflag.All,
-			wCtx.CommitteeAcc.Contract.ScriptHash(), gasReceiver, int64(gasAmount), nil)
-		emit.Opcodes(bw.BinWriter, opcode.ASSERT)
-	}
+	emit.AppCall(bw.BinWriter, gas.Hash, "transfer", callflag.All,
+		wCtx.CommitteeAcc.Contract.ScriptHash(), gasReceiver, int64(gasAmount), nil)
+	emit.Opcodes(bw.BinWriter, opcode.ASSERT)
 	if bw.Err != nil {
 		return fmt.Errorf("BUG: invalid transfer arguments: %w", bw.Err)
 	}

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

@@ -1,12 +1,7 @@
 package generate
 
 import (
-	"fmt"
-
 	"git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-adm/internal/commonflags"
-	"github.com/nspcc-dev/neo-go/pkg/encoding/address"
-	"github.com/nspcc-dev/neo-go/pkg/util"
-	"github.com/nspcc-dev/neo-go/pkg/wallet"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 )
@@ -38,27 +33,7 @@ var (
 			_ = viper.BindPFlag(commonflags.RefillGasAmountFlag, cmd.Flags().Lookup(commonflags.RefillGasAmountFlag))
 		},
 		RunE: func(cmd *cobra.Command, _ []string) error {
-			storageWalletPaths, _ := cmd.Flags().GetStringArray(commonflags.StorageWalletFlag)
-			walletAddresses, _ := cmd.Flags().GetStringArray(walletAddressFlag)
-
-			var gasReceivers []util.Uint160
-			for _, walletAddress := range walletAddresses {
-				addr, err := address.StringToUint160(walletAddress)
-				if err != nil {
-					return fmt.Errorf("invalid wallet address %s: %w", walletAddress, err)
-				}
-
-				gasReceivers = append(gasReceivers, addr)
-			}
-			for _, storageWalletPath := range storageWalletPaths {
-				w, err := wallet.NewWalletFromFile(storageWalletPath)
-				if err != nil {
-					return fmt.Errorf("can't create wallet: %w", err)
-				}
-
-				gasReceivers = append(gasReceivers, w.Accounts[0].Contract.ScriptHash())
-			}
-			return refillGas(cmd, commonflags.RefillGasAmountFlag, gasReceivers...)
+			return refillGas(cmd, commonflags.RefillGasAmountFlag, false)
 		},
 	}
 	GenerateAlphabetCmd = &cobra.Command{
@@ -75,10 +50,10 @@ var (
 func initRefillGasCmd() {
 	RefillGasCmd.Flags().String(commonflags.AlphabetWalletsFlag, "", commonflags.AlphabetWalletsFlagDesc)
 	RefillGasCmd.Flags().StringP(commonflags.EndpointFlag, commonflags.EndpointFlagShort, "", commonflags.EndpointFlagDesc)
-	RefillGasCmd.Flags().StringArray(commonflags.StorageWalletFlag, nil, "Path to storage node wallet")
-	RefillGasCmd.Flags().StringArray(walletAddressFlag, nil, "Address of wallet")
+	RefillGasCmd.Flags().String(commonflags.StorageWalletFlag, "", "Path to storage node wallet")
+	RefillGasCmd.Flags().String(walletAddressFlag, "", "Address of wallet")
 	RefillGasCmd.Flags().String(commonflags.RefillGasAmountFlag, "", "Additional amount of GAS to transfer")
-	RefillGasCmd.MarkFlagsOneRequired(walletAddressFlag, commonflags.StorageWalletFlag)
+	RefillGasCmd.MarkFlagsMutuallyExclusive(walletAddressFlag, commonflags.StorageWalletFlag)
 }
 
 func initGenerateStorageCmd() {

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

@@ -4,6 +4,7 @@ import (
 	"errors"
 	"fmt"
 	"math/big"
+	"strconv"
 
 	"git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-adm/internal/commonflags"
 	"git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-adm/internal/modules/morph/helper"
@@ -40,8 +41,7 @@ func depositNotary(cmd *cobra.Command, _ []string) error {
 	}
 
 	accHash := w.GetChangeAddress()
-	addr, _ := cmd.Flags().GetString(walletAccountFlag)
-	if addr != "" {
+	if addr, err := cmd.Flags().GetString(walletAccountFlag); err == nil {
 		accHash, err = address.StringToUint160(addr)
 		if err != nil {
 			return fmt.Errorf("invalid address: %s", addr)
@@ -53,7 +53,7 @@ func depositNotary(cmd *cobra.Command, _ []string) error {
 		return fmt.Errorf("can't find account for %s", accHash)
 	}
 
-	prompt := fmt.Sprintf("Enter password for %s > ", address.Uint160ToString(accHash))
+	prompt := fmt.Sprintf("Enter password for %s >", address.Uint160ToString(accHash))
 	pass, err := input.ReadPassword(prompt)
 	if err != nil {
 		return fmt.Errorf("can't get password: %v", err)
@@ -73,9 +73,16 @@ func depositNotary(cmd *cobra.Command, _ []string) error {
 		return err
 	}
 
-	till, _ := cmd.Flags().GetInt64(notaryDepositTillFlag)
-	if till <= 0 {
-		return errInvalidNotaryDepositLifetime
+	till := int64(defaultNotaryDepositLifetime)
+	tillStr, err := cmd.Flags().GetString(notaryDepositTillFlag)
+	if err != nil {
+		return err
+	}
+	if tillStr != "" {
+		till, err = strconv.ParseInt(tillStr, 10, 64)
+		if err != nil || till <= 0 {
+			return errInvalidNotaryDepositLifetime
+		}
 	}
 
 	return transferGas(cmd, acc, accHash, gasAmount, till)

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

@@ -20,7 +20,7 @@ func initDepositoryNotaryCmd() {
 	DepositCmd.Flags().String(commonflags.StorageWalletFlag, "", "Path to storage node wallet")
 	DepositCmd.Flags().String(walletAccountFlag, "", "Wallet account address")
 	DepositCmd.Flags().String(commonflags.RefillGasAmountFlag, "", "Amount of GAS to deposit")
-	DepositCmd.Flags().Int64(notaryDepositTillFlag, defaultNotaryDepositLifetime, "Notary deposit duration in blocks")
+	DepositCmd.Flags().String(notaryDepositTillFlag, "", "Notary deposit duration in blocks")
 }
 
 func init() {

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

@@ -20,32 +20,23 @@ const (
 	accountAddressFlag = "account"
 )
 
-func parseAddresses(cmd *cobra.Command) []util.Uint160 {
-	var addrs []util.Uint160
-
-	accs, _ := cmd.Flags().GetStringArray(accountAddressFlag)
-	for _, acc := range accs {
-		addr, err := address.StringToUint160(acc)
-		commonCmd.ExitOnErr(cmd, "invalid account: %w", err)
-
-		addrs = append(addrs, addr)
-	}
-	return addrs
-}
-
 func addProxyAccount(cmd *cobra.Command, _ []string) {
-	addrs := parseAddresses(cmd)
-	err := processAccount(cmd, addrs, "addAccount")
+	acc, _ := cmd.Flags().GetString(accountAddressFlag)
+	addr, err := address.StringToUint160(acc)
+	commonCmd.ExitOnErr(cmd, "invalid account: %w", err)
+	err = processAccount(cmd, addr, "addAccount")
 	commonCmd.ExitOnErr(cmd, "processing error: %w", err)
 }
 
 func removeProxyAccount(cmd *cobra.Command, _ []string) {
-	addrs := parseAddresses(cmd)
-	err := processAccount(cmd, addrs, "removeAccount")
+	acc, _ := cmd.Flags().GetString(accountAddressFlag)
+	addr, err := address.StringToUint160(acc)
+	commonCmd.ExitOnErr(cmd, "invalid account: %w", err)
+	err = processAccount(cmd, addr, "removeAccount")
 	commonCmd.ExitOnErr(cmd, "processing error: %w", err)
 }
 
-func processAccount(cmd *cobra.Command, addrs []util.Uint160, method string) error {
+func processAccount(cmd *cobra.Command, addr util.Uint160, method string) error {
 	wCtx, err := helper.NewInitializeContext(cmd, viper.GetViper())
 	if err != nil {
 		return fmt.Errorf("can't initialize context: %w", err)
@@ -63,9 +54,7 @@ func processAccount(cmd *cobra.Command, addrs []util.Uint160, method string) err
 	}
 
 	bw := io.NewBufBinWriter()
-	for _, addr := range addrs {
-		emit.AppCall(bw.BinWriter, proxyHash, method, callflag.All, addr)
-	}
+	emit.AppCall(bw.BinWriter, proxyHash, method, callflag.All, addr)
 
 	if err := wCtx.SendConsensusTx(bw.Bytes()); err != nil {
 		return err

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

@@ -29,15 +29,13 @@ var (
 
 func initProxyAddAccount() {
 	AddAccountCmd.Flags().StringP(commonflags.EndpointFlag, commonflags.EndpointFlagShort, "", commonflags.EndpointFlagDesc)
-	AddAccountCmd.Flags().StringArray(accountAddressFlag, nil, "Wallet address string")
-	_ = AddAccountCmd.MarkFlagRequired(accountAddressFlag)
+	AddAccountCmd.Flags().String(accountAddressFlag, "", "Wallet address string")
 	AddAccountCmd.Flags().String(commonflags.AlphabetWalletsFlag, "", commonflags.AlphabetWalletsFlagDesc)
 }
 
 func initProxyRemoveAccount() {
 	RemoveAccountCmd.Flags().StringP(commonflags.EndpointFlag, commonflags.EndpointFlagShort, "", commonflags.EndpointFlagDesc)
-	RemoveAccountCmd.Flags().StringArray(accountAddressFlag, nil, "Wallet address string")
-	_ = AddAccountCmd.MarkFlagRequired(accountAddressFlag)
+	RemoveAccountCmd.Flags().String(accountAddressFlag, "", "Wallet address string")
 	RemoveAccountCmd.Flags().String(commonflags.AlphabetWalletsFlag, "", commonflags.AlphabetWalletsFlagDesc)
 }
 

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

@@ -105,7 +105,7 @@ func storageConfig(cmd *cobra.Command, args []string) {
 		fatalOnErr(errors.New("can't find account in wallet"))
 	}
 
-	c.Wallet.Password, err = input.ReadPassword(fmt.Sprintf("Enter password for %s > ", c.Wallet.Account))
+	c.Wallet.Password, err = input.ReadPassword(fmt.Sprintf("Account password for %s: ", c.Wallet.Account))
 	fatalOnErr(err)
 
 	err = acc.Decrypt(c.Wallet.Password, keys.NEP2ScryptParams())

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

@@ -9,6 +9,7 @@ import (
 	"io"
 	"os"
 	"slices"
+	"sort"
 	"strings"
 
 	"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/accounting"
@@ -77,31 +78,13 @@ func ListContainers(ctx context.Context, prm ListContainersPrm) (res ListContain
 // SortedIDList returns sorted list of identifiers of user's containers.
 func (x ListContainersRes) SortedIDList() []cid.ID {
 	list := x.cliRes.Containers()
-	slices.SortFunc(list, func(lhs, rhs cid.ID) int {
-		return strings.Compare(lhs.EncodeToString(), rhs.EncodeToString())
+	sort.Slice(list, func(i, j int) bool {
+		lhs, rhs := list[i].EncodeToString(), list[j].EncodeToString()
+		return strings.Compare(lhs, rhs) < 0
 	})
 	return list
 }
 
-func ListContainersStream(ctx context.Context, prm ListContainersPrm, processCnr func(id cid.ID) bool) (err error) {
-	cliPrm := &client.PrmContainerListStream{
-		XHeaders: prm.XHeaders,
-		OwnerID:  prm.OwnerID,
-		Session:  prm.Session,
-	}
-	rdr, err := prm.cli.ContainerListInit(ctx, *cliPrm)
-	if err != nil {
-		return fmt.Errorf("init container list: %w", err)
-	}
-
-	err = rdr.Iterate(processCnr)
-	if err != nil {
-		return fmt.Errorf("read container list: %w", err)
-	}
-
-	return
-}
-
 // PutContainerPrm groups parameters of PutContainer operation.
 type PutContainerPrm struct {
 	Client       *client.Client

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

@@ -52,7 +52,7 @@ func genereateAPEOverride(cmd *cobra.Command, _ []string) {
 
 	outputPath, _ := cmd.Flags().GetString(outputFlag)
 	if outputPath != "" {
-		err := os.WriteFile(outputPath, overrideMarshalled, 0o644)
+		err := os.WriteFile(outputPath, []byte(overrideMarshalled), 0o644)
 		commonCmd.ExitOnErr(cmd, "dump error: %w", err)
 	} else {
 		fmt.Print("\n")

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

@@ -6,11 +6,8 @@ import (
 	"git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/key"
 	commonCmd "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/internal/common"
 	containerSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container"
-	cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id"
 	"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/user"
 	"github.com/spf13/cobra"
-	"google.golang.org/grpc/codes"
-	"google.golang.org/grpc/status"
 )
 
 // flags of list command.
@@ -54,60 +51,44 @@ var listContainersCmd = &cobra.Command{
 
 		var prm internalclient.ListContainersPrm
 		prm.SetClient(cli)
-		prm.OwnerID = idUser
+		prm.Account = idUser
+
+		res, err := internalclient.ListContainers(cmd.Context(), prm)
+		commonCmd.ExitOnErr(cmd, "rpc error: %w", err)
+
 		prmGet := internalclient.GetContainerPrm{
 			Client: cli,
 		}
-		var containerIDs []cid.ID
-
-		err := internalclient.ListContainersStream(cmd.Context(), prm, func(id cid.ID) bool {
-			printContainer(cmd, prmGet, id)
-			return false
-		})
-		if err == nil {
-			return
-		}
-
-		if e, ok := status.FromError(err); ok && e.Code() == codes.Unimplemented {
-			res, err := internalclient.ListContainers(cmd.Context(), prm)
-			commonCmd.ExitOnErr(cmd, "rpc error: %w", err)
-			containerIDs = res.SortedIDList()
-		} else {
-			commonCmd.ExitOnErr(cmd, "rpc error: %w", err)
-		}
 
+		containerIDs := res.SortedIDList()
 		for _, cnrID := range containerIDs {
-			printContainer(cmd, prmGet, cnrID)
+			if flagVarListName == "" && !flagVarListPrintAttr {
+				cmd.Println(cnrID.String())
+				continue
+			}
+
+			prmGet.ClientParams.ContainerID = &cnrID
+			res, err := internalclient.GetContainer(cmd.Context(), prmGet)
+			if err != nil {
+				cmd.Printf("  failed to read attributes: %v\n", err)
+				continue
+			}
+
+			cnr := res.Container()
+			if cnrName := containerSDK.Name(cnr); flagVarListName != "" && cnrName != flagVarListName {
+				continue
+			}
+			cmd.Println(cnrID.String())
+
+			if flagVarListPrintAttr {
+				cnr.IterateUserAttributes(func(key, val string) {
+					cmd.Printf("  %s: %s\n", key, val)
+				})
+			}
 		}
 	},
 }
 
-func printContainer(cmd *cobra.Command, prmGet internalclient.GetContainerPrm, id cid.ID) {
-	if flagVarListName == "" && !flagVarListPrintAttr {
-		cmd.Println(id.String())
-		return
-	}
-
-	prmGet.ClientParams.ContainerID = &id
-	res, err := internalclient.GetContainer(cmd.Context(), prmGet)
-	if err != nil {
-		cmd.Printf("  failed to read attributes: %v\n", err)
-		return
-	}
-
-	cnr := res.Container()
-	if cnrName := containerSDK.Name(cnr); flagVarListName != "" && cnrName != flagVarListName {
-		return
-	}
-	cmd.Println(id.String())
-
-	if flagVarListPrintAttr {
-		cnr.IterateUserAttributes(func(key, val string) {
-			cmd.Printf("  %s: %s\n", key, val)
-		})
-	}
-}
-
 func initContainerListContainersCmd() {
 	commonflags.Init(listContainersCmd)
 

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

@@ -23,11 +23,11 @@ type policyPlaygroundREPL struct {
 	nodes map[string]netmap.NodeInfo
 }
 
-func newPolicyPlaygroundREPL(cmd *cobra.Command) *policyPlaygroundREPL {
+func newPolicyPlaygroundREPL(cmd *cobra.Command) (*policyPlaygroundREPL, error) {
 	return &policyPlaygroundREPL{
 		cmd:   cmd,
 		nodes: map[string]netmap.NodeInfo{},
-	}
+	}, nil
 }
 
 func (repl *policyPlaygroundREPL) handleLs(args []string) error {
@@ -246,7 +246,8 @@ var policyPlaygroundCmd = &cobra.Command{
 	Long: `A REPL for testing placement policies.
 If a wallet and endpoint is provided, the initial netmap data will be loaded from the snapshot of the node. Otherwise, an empty playground is created.`,
 	Run: func(cmd *cobra.Command, _ []string) {
-		repl := newPolicyPlaygroundREPL(cmd)
+		repl, err := newPolicyPlaygroundREPL(cmd)
+		commonCmd.ExitOnErr(cmd, "could not create policy playground: %w", err)
 		commonCmd.ExitOnErr(cmd, "policy playground failed: %w", repl.run())
 	},
 }

cmd/frostfs-cli/modules/object/hash.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/checksum"
 	cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id"
 	oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id"
 	"github.com/spf13/cobra"
@@ -42,8 +43,6 @@ func initObjectHashCmd() {
 	_ = objectHashCmd.MarkFlagRequired(commonflags.OIDFlag)
 
 	flags.String("range", "", "Range to take hash from in the form offset1:length1,...")
-	_ = objectHashCmd.MarkFlagRequired("range")
-
 	flags.String("type", hashSha256, "Hash type. Either 'sha256' or 'tz'")
 	flags.String(getRangeHashSaltFlag, "", "Salt in hex format")
 }
@@ -67,6 +66,36 @@ func getObjectHash(cmd *cobra.Command, _ []string) {
 	pk := key.GetOrGenerate(cmd)
 	cli := internalclient.GetSDKClientByFlag(cmd, pk, commonflags.RPC)
 
+	tz := typ == hashTz
+	fullHash := len(ranges) == 0
+	if fullHash {
+		var headPrm internalclient.HeadObjectPrm
+		headPrm.SetClient(cli)
+		Prepare(cmd, &headPrm)
+		headPrm.SetAddress(objAddr)
+
+		// get hash of full payload through HEAD (may be user can do it through dedicated command?)
+		res, err := internalclient.HeadObject(cmd.Context(), headPrm)
+		commonCmd.ExitOnErr(cmd, "rpc error: %w", err)
+
+		var cs checksum.Checksum
+		var csSet bool
+
+		if tz {
+			cs, csSet = res.Header().PayloadHomomorphicHash()
+		} else {
+			cs, csSet = res.Header().PayloadChecksum()
+		}
+
+		if csSet {
+			cmd.Println(hex.EncodeToString(cs.Value()))
+		} else {
+			cmd.Println("Missing checksum in object header.")
+		}
+
+		return
+	}
+
 	var hashPrm internalclient.HashPayloadRangesPrm
 	hashPrm.SetClient(cli)
 	Prepare(cmd, &hashPrm)
@@ -75,7 +104,7 @@ func getObjectHash(cmd *cobra.Command, _ []string) {
 	hashPrm.SetSalt(salt)
 	hashPrm.SetRanges(ranges)
 
-	if typ == hashTz {
+	if tz {
 		hashPrm.TZ()
 	}
 

cmd/frostfs-lens/internal/tui/buckets.go

@@ -124,7 +124,10 @@ func (v *BucketsView) loadNodeChildren(
 	path := parentBucket.Path
 	parser := parentBucket.NextParser
 
-	buffer := LoadBuckets(ctx, v.ui.db, path, v.ui.loadBufferSize)
+	buffer, err := LoadBuckets(ctx, v.ui.db, path, v.ui.loadBufferSize)
+	if err != nil {
+		return err
+	}
 
 	for item := range buffer {
 		if item.err != nil {
@@ -132,7 +135,6 @@ func (v *BucketsView) loadNodeChildren(
 		}
 		bucket := item.val
 
-		var err error
 		bucket.Entry, bucket.NextParser, err = parser(bucket.Name, nil)
 		if err != nil {
 			return err
@@ -178,7 +180,10 @@ func (v *BucketsView) bucketSatisfiesFilter(
 	defer cancel()
 
 	// Check the current bucket's nested buckets if exist
-	bucketsBuffer := LoadBuckets(ctx, v.ui.db, bucket.Path, v.ui.loadBufferSize)
+	bucketsBuffer, err := LoadBuckets(ctx, v.ui.db, bucket.Path, v.ui.loadBufferSize)
+	if err != nil {
+		return false, err
+	}
 
 	for item := range bucketsBuffer {
 		if item.err != nil {
@@ -186,7 +191,6 @@ func (v *BucketsView) bucketSatisfiesFilter(
 		}
 		b := item.val
 
-		var err error
 		b.Entry, b.NextParser, err = bucket.NextParser(b.Name, nil)
 		if err != nil {
 			return false, err
@@ -202,7 +206,10 @@ func (v *BucketsView) bucketSatisfiesFilter(
 	}
 
 	// Check the current bucket's nested records if exist
-	recordsBuffer := LoadRecords(ctx, v.ui.db, bucket.Path, v.ui.loadBufferSize)
+	recordsBuffer, err := LoadRecords(ctx, v.ui.db, bucket.Path, v.ui.loadBufferSize)
+	if err != nil {
+		return false, err
+	}
 
 	for item := range recordsBuffer {
 		if item.err != nil {
@@ -210,7 +217,6 @@ func (v *BucketsView) bucketSatisfiesFilter(
 		}
 		r := item.val
 
-		var err error
 		r.Entry, _, err = bucket.NextParser(r.Key, r.Value)
 		if err != nil {
 			return false, err

cmd/frostfs-lens/internal/tui/db.go

@@ -35,7 +35,7 @@ func resolvePath(tx *bbolt.Tx, path [][]byte) (*bbolt.Bucket, error) {
 func load[T any](
 	ctx context.Context, db *bbolt.DB, path [][]byte, bufferSize int,
 	filter func(key, value []byte) bool, transform func(key, value []byte) T,
-) <-chan Item[T] {
+) (<-chan Item[T], error) {
 	buffer := make(chan Item[T], bufferSize)
 
 	go func() {
@@ -77,13 +77,13 @@ func load[T any](
 		}
 	}()
 
-	return buffer
+	return buffer, nil
 }
 
 func LoadBuckets(
 	ctx context.Context, db *bbolt.DB, path [][]byte, bufferSize int,
-) <-chan Item[*Bucket] {
-	buffer := load(
+) (<-chan Item[*Bucket], error) {
+	buffer, err := load(
 		ctx, db, path, bufferSize,
 		func(_, value []byte) bool {
 			return value == nil
@@ -98,14 +98,17 @@ func LoadBuckets(
 			}
 		},
 	)
+	if err != nil {
+		return nil, fmt.Errorf("can't start iterating bucket: %w", err)
+	}
 
-	return buffer
+	return buffer, nil
 }
 
 func LoadRecords(
 	ctx context.Context, db *bbolt.DB, path [][]byte, bufferSize int,
-) <-chan Item[*Record] {
-	buffer := load(
+) (<-chan Item[*Record], error) {
+	buffer, err := load(
 		ctx, db, path, bufferSize,
 		func(_, value []byte) bool {
 			return value != nil
@@ -121,8 +124,11 @@ func LoadRecords(
 			}
 		},
 	)
+	if err != nil {
+		return nil, fmt.Errorf("can't start iterating bucket: %w", err)
+	}
 
-	return buffer
+	return buffer, nil
 }
 
 // HasBuckets checks if a bucket has nested buckets. It relies on assumption
@@ -131,21 +137,24 @@ func HasBuckets(ctx context.Context, db *bbolt.DB, path [][]byte) (bool, error)
 	ctx, cancel := context.WithCancel(ctx)
 	defer cancel()
 
-	buffer := load(
+	buffer, err := load(
 		ctx, db, path, 1,
 		nil,
 		func(_, value []byte) []byte { return value },
 	)
+	if err != nil {
+		return false, err
+	}
 
 	x, ok := <-buffer
 	if !ok {
 		return false, nil
 	}
 	if x.err != nil {
-		return false, x.err
+		return false, err
 	}
 	if x.val != nil {
-		return false, nil
+		return false, err
 	}
 	return true, nil
 }

cmd/frostfs-lens/internal/tui/records.go

@@ -62,7 +62,10 @@ func (v *RecordsView) Mount(ctx context.Context) error {
 
 	ctx, v.onUnmount = context.WithCancel(ctx)
 
-	tempBuffer := LoadRecords(ctx, v.ui.db, v.bucket.Path, v.ui.loadBufferSize)
+	tempBuffer, err := LoadRecords(ctx, v.ui.db, v.bucket.Path, v.ui.loadBufferSize)
+	if err != nil {
+		return err
+	}
 
 	v.buffer = make(chan *Record, v.ui.loadBufferSize)
 	go func() {
@@ -70,12 +73,11 @@ func (v *RecordsView) Mount(ctx context.Context) error {
 
 		for item := range tempBuffer {
 			if item.err != nil {
-				v.ui.stopOnError(item.err)
+				v.ui.stopOnError(err)
 				break
 			}
 			record := item.val
 
-			var err error
 			record.Entry, _, err = v.bucket.NextParser(record.Key, record.Value)
 			if err != nil {
 				v.ui.stopOnError(err)

cmd/frostfs-node/apemanager.go

@@ -19,7 +19,6 @@ func initAPEManagerService(c *cfg) {
 		c.cfgObject.cfgAccessPolicyEngine.policyContractHash)
 
 	execsvc := apemanager.New(c.cfgObject.cnrSource, contractStorage,
-		c.cfgMorph.client,
 		apemanager.WithLogger(c.log))
 	sigsvc := apemanager.NewSignService(&c.key.PrivateKey, execsvc)
 	auditSvc := apemanager.NewAuditService(sigsvc, c.log, c.audit)

cmd/frostfs-node/config.go

@@ -606,10 +606,9 @@ type cfgAccounting struct {
 type cfgContainer struct {
 	scriptHash neogoutil.Uint160
 
-	parsers            map[event.Type]event.NotificationParser
-	subscribers        map[event.Type][]event.Handler
-	workerPool         util.WorkerPool // pool for asynchronous handlers
-	containerBatchSize uint32
+	parsers     map[event.Type]event.NotificationParser
+	subscribers map[event.Type][]event.Handler
+	workerPool  util.WorkerPool // pool for asynchronous handlers
 }
 
 type cfgFrostfsID struct {
@@ -698,7 +697,8 @@ func initCfg(appCfg *config.Config) *cfg {
 
 	netState.metrics = c.metricsCollector
 
-	logPrm := c.loggerPrm()
+	logPrm, err := c.loggerPrm()
+	fatalOnErr(err)
 	logPrm.SamplingHook = c.metricsCollector.LogMetrics().GetSamplingHook()
 	log, err := logger.NewLogger(logPrm)
 	fatalOnErr(err)
@@ -852,8 +852,8 @@ func initFrostfsID(appCfg *config.Config) cfgFrostfsID {
 }
 
 func initCfgGRPC() cfgGRPC {
-	maxChunkSize := uint64(maxMsgSize) * 3 / 4  // 25% to meta, 75% to payload
-	maxAddrAmount := maxChunkSize / addressSize // each address is about 72 bytes
+	maxChunkSize := uint64(maxMsgSize) * 3 / 4          // 25% to meta, 75% to payload
+	maxAddrAmount := uint64(maxChunkSize) / addressSize // each address is about 72 bytes
 
 	return cfgGRPC{
 		maxChunkSize:  maxChunkSize,
@@ -1058,7 +1058,7 @@ func (c *cfg) getShardOpts(ctx context.Context, shCfg shardCfg) shardOptsWithID
 	return sh
 }
 
-func (c *cfg) loggerPrm() *logger.Prm {
+func (c *cfg) loggerPrm() (*logger.Prm, error) {
 	// check if it has been inited before
 	if c.dynamicConfiguration.logger == nil {
 		c.dynamicConfiguration.logger = new(logger.Prm)
@@ -1077,7 +1077,7 @@ func (c *cfg) loggerPrm() *logger.Prm {
 	}
 	c.dynamicConfiguration.logger.PrependTimestamp = c.LoggerCfg.timestamp
 
-	return c.dynamicConfiguration.logger
+	return c.dynamicConfiguration.logger, nil
 }
 
 func (c *cfg) LocalAddress() network.AddressGroup {
@@ -1219,9 +1219,9 @@ func (c *cfg) updateContractNodeInfo(ctx context.Context, epoch uint64) {
 // bootstrapWithState calls "addPeer" method of the Sidechain Netmap contract
 // with the binary-encoded information from the current node's configuration.
 // The state is set using the provided setter which MUST NOT be nil.
-func (c *cfg) bootstrapWithState(ctx context.Context, state netmap.NodeState) error {
+func (c *cfg) bootstrapWithState(ctx context.Context, stateSetter func(*netmap.NodeInfo)) error {
 	ni := c.cfgNodeInfo.localInfo
-	ni.SetStatus(state)
+	stateSetter(&ni)
 
 	prm := nmClient.AddPeerPrm{}
 	prm.SetNodeInfo(ni)
@@ -1231,7 +1231,9 @@ func (c *cfg) bootstrapWithState(ctx context.Context, state netmap.NodeState) er
 
 // bootstrapOnline calls cfg.bootstrapWithState with "online" state.
 func bootstrapOnline(ctx context.Context, c *cfg) error {
-	return c.bootstrapWithState(ctx, netmap.Online)
+	return c.bootstrapWithState(ctx, func(ni *netmap.NodeInfo) {
+		ni.SetStatus(netmap.Online)
+	})
 }
 
 // bootstrap calls bootstrapWithState with:
@@ -1242,7 +1244,9 @@ func (c *cfg) bootstrap(ctx context.Context) error {
 	st := c.cfgNetmap.state.controlNetmapStatus()
 	if st == control.NetmapStatus_MAINTENANCE {
 		c.log.Info(ctx, logs.FrostFSNodeBootstrappingWithTheMaintenanceState)
-		return c.bootstrapWithState(ctx, netmap.Maintenance)
+		return c.bootstrapWithState(ctx, func(ni *netmap.NodeInfo) {
+			ni.SetStatus(netmap.Maintenance)
+		})
 	}
 
 	c.log.Info(ctx, logs.FrostFSNodeBootstrappingWithOnlineState,
@@ -1333,7 +1337,11 @@ func (c *cfg) reloadConfig(ctx context.Context) {
 
 	// Logger
 
-	logPrm := c.loggerPrm()
+	logPrm, err := c.loggerPrm()
+	if err != nil {
+		c.log.Error(ctx, logs.FrostFSNodeLoggerConfigurationPreparation, zap.Error(err))
+		return
+	}
 
 	components := c.getComponents(ctx, logPrm)
 

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

@@ -1,27 +0,0 @@
-package containerconfig
-
-import "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-node/config"
-
-const (
-	subsection           = "container"
-	listStreamSubsection = "list_stream"
-
-	// ContainerBatchSizeDefault represents the maximum amount of containers to send via stream at once.
-	ContainerBatchSizeDefault = 1000
-)
-
-// ContainerBatchSize returns the value of "batch_size" config parameter
-// from "list_stream" subsection of "container" section.
-//
-// Returns ContainerBatchSizeDefault if the value is missing or if
-// the value is not positive integer.
-func ContainerBatchSize(c *config.Config) uint32 {
-	if c.Sub(subsection).Sub(listStreamSubsection).Value("batch_size") == nil {
-		return ContainerBatchSizeDefault
-	}
-	size := config.Uint32Safe(c.Sub(subsection).Sub(listStreamSubsection), "batch_size")
-	if size == 0 {
-		return ContainerBatchSizeDefault
-	}
-	return size
-}

cmd/frostfs-node/config/container/container_test.go

@@ -1,27 +0,0 @@
-package containerconfig_test
-
-import (
-	"testing"
-
-	"git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-node/config"
-	containerconfig "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/container"
-	configtest "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/test"
-	"github.com/stretchr/testify/require"
-)
-
-func TestContainerSection(t *testing.T) {
-	t.Run("defaults", func(t *testing.T) {
-		empty := configtest.EmptyConfig()
-		require.Equal(t, uint32(containerconfig.ContainerBatchSizeDefault), containerconfig.ContainerBatchSize(empty))
-	})
-
-	const path = "../../../../config/example/node"
-	fileConfigTest := func(c *config.Config) {
-		require.Equal(t, uint32(500), containerconfig.ContainerBatchSize(c))
-	}
-
-	configtest.ForEachFileType(path, fileConfigTest)
-	t.Run("ENV", func(t *testing.T) {
-		configtest.ForEnvFileType(t, path, fileConfigTest)
-	})
-}

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

@@ -198,7 +198,7 @@ func (l PersistentPolicyRulesConfig) Path() string {
 //
 // Returns PermDefault if the value is not a positive number.
 func (l PersistentPolicyRulesConfig) Perm() fs.FileMode {
-	p := config.UintSafe(l.cfg, "perm")
+	p := config.UintSafe((*config.Config)(l.cfg), "perm")
 	if p == 0 {
 		p = PermDefault
 	}
@@ -210,7 +210,7 @@ func (l PersistentPolicyRulesConfig) Perm() fs.FileMode {
 //
 // Returns false if the value is not a boolean.
 func (l PersistentPolicyRulesConfig) NoSync() bool {
-	return config.BoolSafe(l.cfg, "no_sync")
+	return config.BoolSafe((*config.Config)(l.cfg), "no_sync")
 }
 
 // CompatibilityMode returns true if need to run node in compatibility with previous versions mode.

cmd/frostfs-node/container.go

@@ -5,7 +5,6 @@ import (
 	"context"
 	"net"
 
-	containerconfig "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/container"
 	morphconfig "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/morph"
 	"git.frostfs.info/TrueCloudLab/frostfs-node/internal/logs"
 	"git.frostfs.info/TrueCloudLab/frostfs-node/internal/metrics"
@@ -43,12 +42,11 @@ func initContainerService(_ context.Context, c *cfg) {
 	fatalOnErr(err)
 
 	cacheSize := morphconfig.FrostfsIDCacheSize(c.appCfg)
-	if cacheSize > 0 && c.cfgMorph.cacheTTL > 0 {
+	if cacheSize > 0 {
 		frostfsIDSubjectProvider = newMorphFrostfsIDCache(frostfsIDSubjectProvider, int(cacheSize), c.cfgMorph.cacheTTL, metrics.NewCacheMetrics("frostfs_id"))
 	}
 
 	c.shared.frostfsidClient = frostfsIDSubjectProvider
-	c.cfgContainer.containerBatchSize = containerconfig.ContainerBatchSize(c.appCfg)
 
 	defaultChainRouter := engine.NewDefaultChainRouterWithLocalOverrides(
 		c.cfgObject.cfgAccessPolicyEngine.accessPolicyEngine.MorphRuleChainStorage(),
@@ -58,9 +56,7 @@ func initContainerService(_ context.Context, c *cfg) {
 		&c.key.PrivateKey,
 		containerService.NewAPEServer(defaultChainRouter, cnrRdr,
 			newCachedIRFetcher(createInnerRingFetcher(c)), c.netMapSource, c.shared.frostfsidClient,
-			containerService.NewSplitterService(
-				c.cfgContainer.containerBatchSize, c.respSvc,
-				containerService.NewExecutionService(containerMorph.NewExecutor(cnrRdr, cnrWrt), c.respSvc)),
+			containerService.NewExecutionService(containerMorph.NewExecutor(cnrRdr, cnrWrt), c.respSvc),
 		),
 	)
 	service = containerService.NewAuditService(service, c.log, c.audit)
@@ -222,7 +218,6 @@ type morphContainerReader struct {
 
 	lister interface {
 		ContainersOf(*user.ID) ([]cid.ID, error)
-		IterateContainersOf(*user.ID, func(cid.ID) error) error
 	}
 }
 
@@ -238,10 +233,6 @@ func (x *morphContainerReader) ContainersOf(id *user.ID) ([]cid.ID, error) {
 	return x.lister.ContainersOf(id)
 }
 
-func (x *morphContainerReader) IterateContainersOf(id *user.ID, processCID func(cid.ID) error) error {
-	return x.lister.IterateContainersOf(id, processCID)
-}
-
 type morphContainerWriter struct {
 	neoClient *cntClient.Client
 }

cmd/frostfs-node/morph.go

@@ -151,7 +151,7 @@ func makeNotaryDeposit(ctx context.Context, c *cfg) (util.Uint256, uint32, error
 }
 
 func waitNotaryDeposit(ctx context.Context, c *cfg, tx util.Uint256, vub uint32) error {
-	if err := c.cfgMorph.client.WaitTxHalt(ctx, vub, tx); err != nil {
+	if err := c.cfgMorph.client.WaitTxHalt(ctx, client.InvokeRes{Hash: tx, VUB: vub}); err != nil {
 		return err
 	}
 

cmd/frostfs-node/netmap.go

@@ -86,7 +86,7 @@ func (s *networkState) setNodeInfo(ni *netmapSDK.NodeInfo) {
 		}
 	}
 
-	s.setControlNetmapStatus(ctrlNetSt)
+	s.setControlNetmapStatus(control.NetmapStatus(ctrlNetSt))
 }
 
 // sets the current node state to the given value. Subsequent cfg.bootstrap
@@ -423,7 +423,7 @@ func (c *cfg) updateNetMapState(ctx context.Context, stateSetter func(*nmClient.
 	if err != nil {
 		return err
 	}
-	return c.cfgNetmap.wrapper.Morph().WaitTxHalt(ctx, res.VUB, res.Hash)
+	return c.cfgNetmap.wrapper.Morph().WaitTxHalt(ctx, res)
 }
 
 type netInfo struct {

cmd/frostfs-node/object.go

@@ -215,7 +215,8 @@ func addPolicer(c *cfg, keyStorage *util.KeyStorage, clientConstructor *cache.Cl
 		prm.MarkAsGarbage(addr)
 		prm.WithForceRemoval()
 
-		return ls.Inhume(ctx, prm)
+		_, err := ls.Inhume(ctx, prm)
+		return err
 	}
 
 	remoteReader := objectService.NewRemoteReader(keyStorage, clientConstructor)
@@ -265,7 +266,8 @@ func addPolicer(c *cfg, keyStorage *util.KeyStorage, clientConstructor *cache.Cl
 			var inhumePrm engine.InhumePrm
 			inhumePrm.MarkAsGarbage(addr)
 
-			if err := ls.Inhume(ctx, inhumePrm); err != nil {
+			_, err := ls.Inhume(ctx, inhumePrm)
+			if err != nil {
 				c.log.Warn(ctx, logs.FrostFSNodeCouldNotInhumeMarkRedundantCopyAsGarbage,
 					zap.Error(err),
 				)
@@ -474,7 +476,8 @@ func (e engineWithoutNotifications) Delete(ctx context.Context, tombstone oid.Ad
 
 	prm.WithTarget(tombstone, addrs...)
 
-	return e.engine.Inhume(ctx, prm)
+	_, err := e.engine.Inhume(ctx, prm)
+	return err
 }
 
 func (e engineWithoutNotifications) Lock(ctx context.Context, locker oid.Address, toLock []oid.ID) error {

config/example/node.env

@@ -83,9 +83,6 @@ FROSTFS_POLICER_HEAD_TIMEOUT=15s
 FROSTFS_REPLICATOR_PUT_TIMEOUT=15s
 FROSTFS_REPLICATOR_POOL_SIZE=10
 
-# Container service section
-FROSTFS_CONTAINER_LIST_STREAM_BATCH_SIZE=500
-
 # Object service section
 FROSTFS_OBJECT_PUT_REMOTE_POOL_SIZE=100
 FROSTFS_OBJECT_PUT_LOCAL_POOL_SIZE=200

config/example/node.json

@@ -124,11 +124,6 @@
     "pool_size": 10,
     "put_timeout": "15s"
   },
-  "container": {
-    "list_stream": {
-      "batch_size": "500"
-    }
-  },
   "object": {
     "delete": {
       "tombstone_lifetime": 10

config/example/node.yaml

@@ -79,8 +79,7 @@ contracts:  # side chain NEOFS contract script hashes; optional, override values
 
 morph:
   dial_timeout: 30s  # timeout for side chain NEO RPC client connection
-  cache_ttl: 15s  # Sidechain cache TTL value (min interval between similar calls).
-                  # Negative value disables caching. A zero value sets the default value.
+  cache_ttl: 15s  # Sidechain cache TTL value (min interval between similar calls). Negative value disables caching.
                   # Default value: block time. It is recommended to have this value less or equal to block time.
                   # Cached entities: containers, container lists, eACL tables.
   container_cache_size: 100 # container_cache_size is is the maximum number of containers in the cache.
@@ -109,10 +108,6 @@ replicator:
   put_timeout: 15s  # timeout for the Replicator PUT remote operation
   pool_size: 10     # maximum amount of concurrent replications
 
-container:
-  list_stream:
-    batch_size: 500 # container_batch_size is the maximum amount of containers to send via stream at once
-
 object:
   delete:
     tombstone_lifetime: 10 # tombstone "local" lifetime in epochs

dev/.vscode-example/launch.json

@@ -42,6 +42,7 @@
                 "FROSTFS_MORPH_DIAL_TIMEOUT":"30s",
                 "FROSTFS_MORPH_RPC_ENDPOINT_0_ADDRESS":"ws://127.0.0.1:30333/ws",
                 "FROSTFS_MORPH_RPC_ENDPOINT_0_PRIORITY":"0",
+                "FROSTFS_MORPH_INACTIVITY_TIMEOUT":"60s",
                 "FROSTFS_NODE_WALLET_PATH":"${workspaceFolder}/dev/storage/wallet01.json",
                 "FROSTFS_NODE_WALLET_PASSWORD":"",
                 "FROSTFS_NODE_ADDRESSES":"127.0.0.1:8080",
@@ -97,6 +98,7 @@
                 "FROSTFS_MORPH_DIAL_TIMEOUT":"30s",
                 "FROSTFS_MORPH_RPC_ENDPOINT_0_ADDRESS":"ws://127.0.0.1:30333/ws",
                 "FROSTFS_MORPH_RPC_ENDPOINT_0_PRIORITY":"0",
+                "FROSTFS_MORPH_INACTIVITY_TIMEOUT":"60s",
                 "FROSTFS_NODE_WALLET_PATH":"${workspaceFolder}/dev/storage/wallet02.json",
                 "FROSTFS_NODE_WALLET_PASSWORD":"",
                 "FROSTFS_NODE_ADDRESSES":"127.0.0.1:8082",
@@ -152,6 +154,7 @@
                 "FROSTFS_MORPH_DIAL_TIMEOUT":"30s",
                 "FROSTFS_MORPH_RPC_ENDPOINT_0_ADDRESS":"ws://127.0.0.1:30333/ws",
                 "FROSTFS_MORPH_RPC_ENDPOINT_0_PRIORITY":"0",
+                "FROSTFS_MORPH_INACTIVITY_TIMEOUT":"60s",
                 "FROSTFS_NODE_WALLET_PATH":"${workspaceFolder}/dev/storage/wallet03.json",
                 "FROSTFS_NODE_WALLET_PASSWORD":"",
                 "FROSTFS_NODE_ADDRESSES":"127.0.0.1:8084",
@@ -207,6 +210,7 @@
                 "FROSTFS_MORPH_DIAL_TIMEOUT":"30s",
                 "FROSTFS_MORPH_RPC_ENDPOINT_0_ADDRESS":"ws://127.0.0.1:30333/ws",
                 "FROSTFS_MORPH_RPC_ENDPOINT_0_PRIORITY":"0",
+                "FROSTFS_MORPH_INACTIVITY_TIMEOUT":"60s",
                 "FROSTFS_NODE_WALLET_PATH":"${workspaceFolder}/dev/storage/wallet04.json",
                 "FROSTFS_NODE_WALLET_PASSWORD":"",
                 "FROSTFS_NODE_ADDRESSES":"127.0.0.1:8086",

docs/release-instruction.md

@@ -95,15 +95,19 @@ $ git push origin ${FROSTFS_TAG_PREFIX}${FROSTFS_REVISION}
 
 ## Post-release
 
-### Prepare and push images to a Docker registry (automated)
+### Prepare and push images to a Docker Hub (if not automated)
 
-Create Docker images for all applications and push them into container registry
-(executed automatically in Forgejo Actions upon pushing a release tag):
+Create Docker images for all applications and push them into Docker Hub
+(requires [organization](https://hub.docker.com/u/truecloudlab) privileges)
 
 ```shell
 $ git checkout ${FROSTFS_TAG_PREFIX}${FROSTFS_REVISION}
 $ make images
-$ make push-images
+$ docker push truecloudlab/frostfs-storage:${FROSTFS_REVISION}
+$ docker push truecloudlab/frostfs-storage-testnet:${FROSTFS_REVISION}
+$ docker push truecloudlab/frostfs-ir:${FROSTFS_REVISION}
+$ docker push truecloudlab/frostfs-cli:${FROSTFS_REVISION}
+$ docker push truecloudlab/frostfs-adm:${FROSTFS_REVISION}
 ```
 
 ### Make a proper release (if not automated)

go.mod

@@ -8,7 +8,7 @@ require (
 	git.frostfs.info/TrueCloudLab/frostfs-crypto v0.6.0
 	git.frostfs.info/TrueCloudLab/frostfs-locode-db v0.4.1-0.20240710074952-65761deb5c0d
 	git.frostfs.info/TrueCloudLab/frostfs-observability v0.0.0-20241112082307-f17779933e88
-	git.frostfs.info/TrueCloudLab/frostfs-sdk-go v0.0.0-20250109084609-328d214d2d76
+	git.frostfs.info/TrueCloudLab/frostfs-sdk-go v0.0.0-20241206094944-81c423e7094d
 	git.frostfs.info/TrueCloudLab/hrw v1.2.1
 	git.frostfs.info/TrueCloudLab/multinet v0.0.0-20241015075604-6cb0d80e0972
 	git.frostfs.info/TrueCloudLab/policy-engine v0.0.0-20240814080254-96225afacb88
@@ -27,7 +27,7 @@ require (
 	github.com/klauspost/compress v1.17.4
 	github.com/mailru/easyjson v0.7.7
 	github.com/mr-tron/base58 v1.2.0
-	github.com/multiformats/go-multiaddr v0.14.0
+	github.com/multiformats/go-multiaddr v0.12.1
 	github.com/nspcc-dev/neo-go v0.106.3
 	github.com/olekukonko/tablewriter v0.0.5
 	github.com/panjf2000/ants/v2 v2.9.0
@@ -40,15 +40,15 @@ require (
 	github.com/ssgreg/journald v1.0.0
 	github.com/stretchr/testify v1.9.0
 	go.etcd.io/bbolt v1.3.10
-	go.opentelemetry.io/otel v1.31.0
-	go.opentelemetry.io/otel/trace v1.31.0
+	go.opentelemetry.io/otel v1.28.0
+	go.opentelemetry.io/otel/trace v1.28.0
 	go.uber.org/zap v1.27.0
 	golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56
-	golang.org/x/sync v0.10.0
-	golang.org/x/sys v0.28.0
-	golang.org/x/term v0.27.0
-	google.golang.org/grpc v1.69.2
-	google.golang.org/protobuf v1.36.1
+	golang.org/x/sync v0.7.0
+	golang.org/x/sys v0.22.0
+	golang.org/x/term v0.21.0
+	google.golang.org/grpc v1.66.2
+	google.golang.org/protobuf v1.34.2
 	gopkg.in/yaml.v3 v3.0.1
 )
 
@@ -119,15 +119,15 @@ require (
 	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0 // indirect
 	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.28.0 // indirect
 	go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.28.0 // indirect
-	go.opentelemetry.io/otel/metric v1.31.0 // indirect
-	go.opentelemetry.io/otel/sdk v1.31.0 // indirect
+	go.opentelemetry.io/otel/metric v1.28.0 // indirect
+	go.opentelemetry.io/otel/sdk v1.28.0 // indirect
 	go.opentelemetry.io/proto/otlp v1.3.1 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
-	golang.org/x/crypto v0.31.0 // indirect
-	golang.org/x/net v0.30.0 // indirect
-	golang.org/x/text v0.21.0 // indirect
-	google.golang.org/genproto/googleapis/api v0.0.0-20241015192408-796eee8c2d53 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20241015192408-796eee8c2d53 // indirect
+	golang.org/x/crypto v0.24.0 // indirect
+	golang.org/x/net v0.26.0 // indirect
+	golang.org/x/text v0.16.0 // indirect
+	google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
 	lukechampine.com/blake3 v1.2.1 // indirect
 	rsc.io/tmplfunc v0.0.3 // indirect

internal/logs/logs.go

@@ -146,6 +146,7 @@ const (
 	ClientCantGetBlockchainHeight                                        = "can't get blockchain height"
 	ClientCantGetBlockchainHeight243                                     = "can't get blockchain height"
 	EventCouldNotSubmitHandlerToWorkerPool                               = "could not Submit handler to worker pool"
+	EventCouldNotStartListenToEvents                                     = "could not start listen to events"
 	EventStopEventListenerByError                                        = "stop event listener by error"
 	EventStopEventListenerByContext                                      = "stop event listener by context"
 	EventStopEventListenerByNotificationChannel                          = "stop event listener by notification channel"
@@ -383,6 +384,7 @@ const (
 	FrostFSNodeShutdownSkip                                              = "node is already shutting down, skipped shutdown"
 	FrostFSNodeShutdownWhenNotReady                                      = "node is going to shut down when subsystems are still initializing"
 	FrostFSNodeConfigurationReading                                      = "configuration reading"
+	FrostFSNodeLoggerConfigurationPreparation                            = "logger configuration preparation"
 	FrostFSNodeTracingConfigationUpdated                                 = "tracing configation updated"
 	FrostFSNodeStorageEngineConfigurationUpdate                          = "storage engine configuration update"
 	FrostFSNodePoolConfigurationUpdate                                   = "adjust pool configuration"

internal/metrics/application.go

@@ -12,9 +12,8 @@ type ApplicationInfo struct {
 func NewApplicationInfo(version string) *ApplicationInfo {
 	appInfo := &ApplicationInfo{
 		versionValue: metrics.NewGaugeVec(prometheus.GaugeOpts{
-			Namespace: namespace,
-			Name:      "app_info",
-			Help:      "General information about the application.",
+			Name: "app_info",
+			Help: "General information about the application.",
 		}, []string{"version"}),
 	}
 	appInfo.versionValue.With(prometheus.Labels{"version": version})

pkg/ape/contract_storage/proxy.go

@@ -31,7 +31,9 @@ type RPCActorProvider interface {
 type ProxyVerificationContractStorage struct {
 	rpcActorProvider RPCActorProvider
 
-	cosigners []actor.SignerAccount
+	acc *wallet.Account
+
+	proxyScriptHash util.Uint160
 
 	policyScriptHash util.Uint160
 }
@@ -39,27 +41,12 @@ type ProxyVerificationContractStorage struct {
 var _ ProxyAdaptedContractStorage = (*ProxyVerificationContractStorage)(nil)
 
 func NewProxyVerificationContractStorage(rpcActorProvider RPCActorProvider, key *keys.PrivateKey, proxyScriptHash, policyScriptHash util.Uint160) *ProxyVerificationContractStorage {
-	acc := wallet.NewAccountFromPrivateKey(key)
 	return &ProxyVerificationContractStorage{
 		rpcActorProvider: rpcActorProvider,
 
-		cosigners: []actor.SignerAccount{
-			{
-				Signer: transaction.Signer{
-					Account:          proxyScriptHash,
-					Scopes:           transaction.CustomContracts,
-					AllowedContracts: []util.Uint160{policyScriptHash},
-				},
-				Account: notary.FakeContractAccount(proxyScriptHash),
-			},
-			{
-				Signer: transaction.Signer{
-					Account: acc.Contract.ScriptHash(),
-					Scopes:  transaction.CalledByEntry,
-				},
-				Account: acc,
-			},
-		},
+		acc: wallet.NewAccountFromPrivateKey(key),
+
+		proxyScriptHash: proxyScriptHash,
 
 		policyScriptHash: policyScriptHash,
 	}
@@ -77,7 +64,7 @@ func (n *contractStorageActorAdapter) GetRPCInvoker() invoker.RPCInvoke {
 
 func (contractStorage *ProxyVerificationContractStorage) newContractStorageActor() (policy_morph.ContractStorageActor, error) {
 	rpcActor := contractStorage.rpcActorProvider.GetRPCActor()
-	act, err := actor.New(rpcActor, contractStorage.cosigners)
+	act, err := actor.New(rpcActor, cosigners(contractStorage.acc, contractStorage.proxyScriptHash, contractStorage.policyScriptHash))
 	if err != nil {
 		return nil, err
 	}
@@ -111,16 +98,31 @@ func (contractStorage *ProxyVerificationContractStorage) RemoveMorphRuleChain(na
 
 // ListMorphRuleChains lists morph rule chains from Policy contract using both Proxy contract and storage account as consigners.
 func (contractStorage *ProxyVerificationContractStorage) ListMorphRuleChains(name chain.Name, target engine.Target) ([]*chain.Chain, error) {
-	rpcActor := contractStorage.rpcActorProvider.GetRPCActor()
-	inv := &invokerAdapter{Invoker: invoker.New(rpcActor, nil), rpcInvoker: rpcActor}
-	return policy_morph.NewContractStorageReader(inv, contractStorage.policyScriptHash).ListMorphRuleChains(name, target)
+	// contractStorageActor is reconstructed per each method invocation because RPCActor's (that is, basically, WSClient) connection may get invalidated, but
+	// ProxyVerificationContractStorage does not manage reconnections.
+	contractStorageActor, err := contractStorage.newContractStorageActor()
+	if err != nil {
+		return nil, err
+	}
+	return policy_morph.NewContractStorage(contractStorageActor, contractStorage.policyScriptHash).ListMorphRuleChains(name, target)
 }
 
-type invokerAdapter struct {
-	*invoker.Invoker
-	rpcInvoker invoker.RPCInvoke
-}
-
-func (n *invokerAdapter) GetRPCInvoker() invoker.RPCInvoke {
-	return n.rpcInvoker
+func cosigners(acc *wallet.Account, proxyScriptHash, policyScriptHash util.Uint160) []actor.SignerAccount {
+	return []actor.SignerAccount{
+		{
+			Signer: transaction.Signer{
+				Account:          proxyScriptHash,
+				Scopes:           transaction.CustomContracts,
+				AllowedContracts: []util.Uint160{policyScriptHash},
+			},
+			Account: notary.FakeContractAccount(proxyScriptHash),
+		},
+		{
+			Signer: transaction.Signer{
+				Account: acc.Contract.ScriptHash(),
+				Scopes:  transaction.CalledByEntry,
+			},
+			Account: acc,
+		},
+	}
 }

pkg/innerring/initialization.go

@@ -38,7 +38,10 @@ import (
 func (s *Server) initNetmapProcessor(ctx context.Context, cfg *viper.Viper,
 	alphaSync event.Handler,
 ) error {
-	locodeValidator := s.newLocodeValidator(cfg)
+	locodeValidator, err := s.newLocodeValidator(cfg)
+	if err != nil {
+		return err
+	}
 
 	netSettings := (*networkSettings)(s.netmapClient)
 
@@ -48,7 +51,6 @@ func (s *Server) initNetmapProcessor(ctx context.Context, cfg *viper.Viper,
 	poolSize := cfg.GetInt("workers.netmap")
 	s.log.Debug(ctx, logs.NetmapNetmapWorkerPool, zap.Int("size", poolSize))
 
-	var err error
 	s.netmapProcessor, err = netmap.New(&netmap.Params{
 		Log:              s.log,
 		Metrics:          s.irMetrics,

pkg/innerring/locode.go

@@ -9,7 +9,7 @@ import (
 	"github.com/spf13/viper"
 )
 
-func (s *Server) newLocodeValidator(cfg *viper.Viper) netmap.NodeValidator {
+func (s *Server) newLocodeValidator(cfg *viper.Viper) (netmap.NodeValidator, error) {
 	locodeDB := locodebolt.New(locodebolt.Prm{
 		Path: cfg.GetString("locode.db.path"),
 	},
@@ -21,7 +21,7 @@ func (s *Server) newLocodeValidator(cfg *viper.Viper) netmap.NodeValidator {
 
 	return irlocode.New(irlocode.Prm{
 		DB: (*locodeBoltDBWrapper)(locodeDB),
-	})
+	}), nil
 }
 
 type locodeBoltEntryWrapper struct {

pkg/local_object_storage/blobovnicza/control.go

@@ -129,7 +129,7 @@ func (b *Blobovnicza) initializeCounters(ctx context.Context) error {
 		})
 	})
 	if err != nil {
-		return fmt.Errorf("determine DB size: %w", err)
+		return fmt.Errorf("can't determine DB size: %w", err)
 	}
 	if (!sizeExists || !itemsCountExists) && !b.boltOptions.ReadOnly {
 		b.log.Debug(ctx, logs.BlobovniczaSavingCountersToMeta, zap.Uint64("size", size), zap.Uint64("items", items))
@@ -140,7 +140,7 @@ func (b *Blobovnicza) initializeCounters(ctx context.Context) error {
 			return saveItemsCount(tx, items)
 		}); err != nil {
 			b.log.Debug(ctx, logs.BlobovniczaSavingCountersToMetaFailed, zap.Uint64("size", size), zap.Uint64("items", items))
-			return fmt.Errorf("save blobovnicza's size and items count: %w", err)
+			return fmt.Errorf("can't save blobovnicza's size and items count: %w", err)
 		}
 		b.log.Debug(ctx, logs.BlobovniczaSavingCountersToMetaSuccess, zap.Uint64("size", size), zap.Uint64("items", items))
 	}

pkg/local_object_storage/blobovnicza/iterate.go

@@ -146,7 +146,7 @@ func (b *Blobovnicza) Iterate(ctx context.Context, prm IteratePrm) (IterateRes,
 						if prm.ignoreErrors {
 							return nil
 						}
-						return fmt.Errorf("decode address key: %w", err)
+						return fmt.Errorf("could not decode address key: %w", err)
 					}
 				}
 

pkg/local_object_storage/blobstor/blobovniczatree/delete.go

@@ -19,10 +19,7 @@ import (
 	"go.uber.org/zap"
 )
 
-var (
-	errObjectIsDeleteProtected = errors.New("object is delete protected")
-	deleteRes                  = common.DeleteRes{}
-)
+var errObjectIsDeleteProtected = errors.New("object is delete protected")
 
 // Delete deletes object from blobovnicza tree.
 //
@@ -46,17 +43,17 @@ func (b *Blobovniczas) Delete(ctx context.Context, prm common.DeletePrm) (res co
 	defer span.End()
 
 	if b.readOnly {
-		return deleteRes, common.ErrReadOnly
+		return common.DeleteRes{}, common.ErrReadOnly
 	}
 
 	if b.rebuildGuard.TryRLock() {
 		defer b.rebuildGuard.RUnlock()
 	} else {
-		return deleteRes, errRebuildInProgress
+		return common.DeleteRes{}, errRebuildInProgress
 	}
 
 	if b.deleteProtectedObjects.Contains(prm.Address) {
-		return deleteRes, errObjectIsDeleteProtected
+		return common.DeleteRes{}, errObjectIsDeleteProtected
 	}
 
 	var bPrm blobovnicza.DeletePrm
@@ -101,7 +98,7 @@ func (b *Blobovniczas) Delete(ctx context.Context, prm common.DeletePrm) (res co
 
 	if err == nil && !objectFound {
 		// not found in any blobovnicza
-		return deleteRes, logicerr.Wrap(new(apistatus.ObjectNotFound))
+		return common.DeleteRes{}, logicerr.Wrap(new(apistatus.ObjectNotFound))
 	}
 	success = err == nil
 
@@ -115,7 +112,7 @@ func (b *Blobovniczas) deleteObjectFromLevel(ctx context.Context, prm blobovnicz
 	shBlz := b.getBlobovnicza(ctx, blzPath)
 	blz, err := shBlz.Open(ctx)
 	if err != nil {
-		return deleteRes, err
+		return common.DeleteRes{}, err
 	}
 	defer shBlz.Close(ctx)
 
@@ -125,5 +122,5 @@ func (b *Blobovniczas) deleteObjectFromLevel(ctx context.Context, prm blobovnicz
 // removes object from blobovnicza and returns common.DeleteRes.
 func (b *Blobovniczas) deleteObject(ctx context.Context, blz *blobovnicza.Blobovnicza, prm blobovnicza.DeletePrm) (common.DeleteRes, error) {
 	_, err := blz.Delete(ctx, prm)
-	return deleteRes, err
+	return common.DeleteRes{}, err
 }

pkg/local_object_storage/blobstor/blobovniczatree/get.go

@@ -115,13 +115,13 @@ func (b *Blobovniczas) getObject(ctx context.Context, blz *blobovnicza.Blobovnic
 	// decompress the data
 	data, err := b.compression.Decompress(res.Object())
 	if err != nil {
-		return common.GetRes{}, fmt.Errorf("decompress object data: %w", err)
+		return common.GetRes{}, fmt.Errorf("could not decompress object data: %w", err)
 	}
 
 	// unmarshal the object
 	obj := objectSDK.New()
 	if err := obj.Unmarshal(data); err != nil {
-		return common.GetRes{}, fmt.Errorf("unmarshal the object: %w", err)
+		return common.GetRes{}, fmt.Errorf("could not unmarshal the object: %w", err)
 	}
 
 	return common.GetRes{Object: obj, RawData: data}, nil

pkg/local_object_storage/blobstor/blobovniczatree/get_range.go

@@ -130,13 +130,13 @@ func (b *Blobovniczas) getObjectRange(ctx context.Context, blz *blobovnicza.Blob
 	// decompress the data
 	data, err := b.compression.Decompress(res.Object())
 	if err != nil {
-		return common.GetRangeRes{}, fmt.Errorf("decompress object data: %w", err)
+		return common.GetRangeRes{}, fmt.Errorf("could not decompress object data: %w", err)
 	}
 
 	// unmarshal the object
 	obj := objectSDK.New()
 	if err := obj.Unmarshal(data); err != nil {
-		return common.GetRangeRes{}, fmt.Errorf("unmarshal the object: %w", err)
+		return common.GetRangeRes{}, fmt.Errorf("could not unmarshal the object: %w", err)
 	}
 
 	from := prm.Range.GetOffset()

pkg/local_object_storage/blobstor/blobovniczatree/iterate.go

@@ -49,7 +49,7 @@ func (b *Blobovniczas) Iterate(ctx context.Context, prm common.IteratePrm) (comm
 						zap.String("root_path", b.rootPath))
 					return nil
 				}
-				return fmt.Errorf("decompress object data: %w", err)
+				return fmt.Errorf("could not decompress object data: %w", err)
 			}
 
 			if prm.Handler != nil {
@@ -82,7 +82,7 @@ func (b *Blobovniczas) iterateBlobovniczas(ctx context.Context, ignoreErrors boo
 					zap.String("root_path", b.rootPath))
 				return false, nil
 			}
-			return false, fmt.Errorf("open blobovnicza %s: %w", p, err)
+			return false, fmt.Errorf("could not open blobovnicza %s: %w", p, err)
 		}
 		defer shBlz.Close(ctx)
 
@@ -249,12 +249,6 @@ func (b *Blobovniczas) iterateSortedDBPaths(ctx context.Context, addr oid.Addres
 }
 
 func (b *Blobovniczas) iterateSordedDBPathsInternal(ctx context.Context, path string, addr oid.Address, f func(string) (bool, error)) (bool, error) {
-	select {
-	case <-ctx.Done():
-		return false, ctx.Err()
-	default:
-	}
-
 	sysPath := filepath.Join(b.rootPath, path)
 	entries, err := os.ReadDir(sysPath)
 	if os.IsNotExist(err) && b.readOnly && path == "" { // non initialized tree in read only mode

pkg/local_object_storage/blobstor/blobovniczatree/manager.go

@@ -69,10 +69,10 @@ func (b *sharedDB) Open(ctx context.Context) (*blobovnicza.Blobovnicza, error) {
 	)...)
 
 	if err := blz.Open(ctx); err != nil {
-		return nil, fmt.Errorf("open blobovnicza %s: %w", b.path, err)
+		return nil, fmt.Errorf("could not open blobovnicza %s: %w", b.path, err)
 	}
 	if err := blz.Init(ctx); err != nil {
-		return nil, fmt.Errorf("init blobovnicza %s: %w", b.path, err)
+		return nil, fmt.Errorf("could not init blobovnicza %s: %w", b.path, err)
 	}
 
 	b.refCount++
@@ -127,7 +127,7 @@ func (b *sharedDB) CloseAndRemoveFile(ctx context.Context) error {
 			zap.String("id", b.path),
 			zap.Error(err),
 		)
-		return fmt.Errorf("close blobovnicza (path = %s): %w", b.path, err)
+		return fmt.Errorf("failed to close blobovnicza (path = %s): %w", b.path, err)
 	}
 
 	b.refCount = 0

pkg/local_object_storage/blobstor/fstree/fstree.go

@@ -538,7 +538,7 @@ func (t *FSTree) countFiles() (uint64, uint64, error) {
 		},
 	)
 	if err != nil {
-		return 0, 0, fmt.Errorf("walk through %s directory: %w", t.RootPath, err)
+		return 0, 0, fmt.Errorf("could not walk through %s directory: %w", t.RootPath, err)
 	}
 
 	return count, size, nil
@@ -577,7 +577,7 @@ func (t *FSTree) ObjectsCount(ctx context.Context) (uint64, error) {
 		},
 	)
 	if err != nil {
-		return 0, fmt.Errorf("walk through %s directory: %w", t.RootPath, err)
+		return 0, fmt.Errorf("could not walk through %s directory: %w", t.RootPath, err)
 	}
 	success = true
 	return result, nil

pkg/local_object_storage/blobstor/fstree/fstree_write_generic.go

@@ -136,6 +136,6 @@ func (w *genericWriter) removeWithCounter(p string, size uint64) error {
 	if err := os.Remove(p); err != nil {
 		return err
 	}
-	w.fileCounter.Dec(size)
+	w.fileCounter.Dec(uint64(size))
 	return nil
 }

pkg/local_object_storage/blobstor/fstree/fstree_write_linux.go

@@ -69,13 +69,10 @@ func (w *linuxWriter) writeFile(p string, data []byte) error {
 	if err != nil {
 		return err
 	}
-	written := 0
 	tmpPath := "/proc/self/fd/" + strconv.FormatUint(uint64(fd), 10)
 	n, err := unix.Write(fd, data)
-	for err == nil {
-		written += n
-
-		if written == len(data) {
+	if err == nil {
+		if n == len(data) {
 			err = unix.Linkat(unix.AT_FDCWD, tmpPath, unix.AT_FDCWD, p, unix.AT_SYMLINK_FOLLOW)
 			if err == nil {
 				w.fileCounter.Inc(uint64(len(data)))
@@ -83,23 +80,9 @@ func (w *linuxWriter) writeFile(p string, data []byte) error {
 			if errors.Is(err, unix.EEXIST) {
 				err = nil
 			}
-			break
+		} else {
+			err = errors.New("incomplete write")
 		}
-
-		// From man 2 write:
-		// https://www.man7.org/linux/man-pages/man2/write.2.html
-		//
-		// Note that a successful write() may transfer fewer than count
-		// bytes.  Such partial writes can occur for various reasons; for
-		// example, because there was insufficient space on the disk device
-		// to write all of the requested bytes, or because a blocked write()
-		// to a socket, pipe, or similar was interrupted by a signal handler
-		// after it had transferred some, but before it had transferred all
-		// of the requested bytes.  In the event of a partial write, the
-		// caller can make another write() call to transfer the remaining
-		// bytes.  The subsequent call will either transfer further bytes or
-		// may result in an error (e.g., if the disk is now full).
-		n, err = unix.Write(fd, data[written:])
 	}
 	errClose := unix.Close(fd)
 	if err != nil {
@@ -131,7 +114,7 @@ func (w *linuxWriter) removeFile(p string, size uint64) error {
 		return logicerr.Wrap(new(apistatus.ObjectNotFound))
 	}
 	if err == nil {
-		w.fileCounter.Dec(size)
+		w.fileCounter.Dec(uint64(size))
 	}
 	return err
 }

pkg/local_object_storage/blobstor/fstree/fstree_write_linux_test.go

@@ -1,42 +0,0 @@
-//go:build linux && integration
-
-package fstree
-
-import (
-	"context"
-	"errors"
-	"os"
-	"testing"
-
-	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/common"
-	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard/mode"
-	"github.com/stretchr/testify/require"
-	"golang.org/x/sys/unix"
-)
-
-func TestENOSPC(t *testing.T) {
-	dir, err := os.MkdirTemp(t.TempDir(), "ramdisk")
-	require.NoError(t, err)
-
-	f, err := os.CreateTemp(t.TempDir(), "ramdisk_*")
-	require.NoError(t, err)
-
-	err = unix.Mount(f.Name(), dir, "tmpfs", 0, "size=1M")
-	if errors.Is(err, unix.EPERM) {
-		t.Skipf("skip size tests: no permission to mount: %v", err)
-		return
-	}
-	require.NoError(t, err)
-	defer func() {
-		require.NoError(t, unix.Unmount(dir, 0))
-	}()
-
-	fst := New(WithPath(dir), WithDepth(1))
-	require.NoError(t, fst.Open(mode.ComponentReadWrite))
-	require.NoError(t, fst.Init())
-
-	_, err = fst.Put(context.Background(), common.PutPrm{
-		RawData: make([]byte, 10<<20),
-	})
-	require.ErrorIs(t, err, common.ErrNoSpace)
-}

pkg/local_object_storage/blobstor/memstore/memstore.go

@@ -47,13 +47,13 @@ func (s *memstoreImpl) Get(_ context.Context, req common.GetPrm) (common.GetRes,
 	// Decompress the data.
 	var err error
 	if data, err = s.compression.Decompress(data); err != nil {
-		return common.GetRes{}, fmt.Errorf("decompress object data: %w", err)
+		return common.GetRes{}, fmt.Errorf("could not decompress object data: %w", err)
 	}
 
 	// Unmarshal the SDK object.
 	obj := objectSDK.New()
 	if err := obj.Unmarshal(data); err != nil {
-		return common.GetRes{}, fmt.Errorf("unmarshal the object: %w", err)
+		return common.GetRes{}, fmt.Errorf("could not unmarshal the object: %w", err)
 	}
 
 	return common.GetRes{Object: obj, RawData: data}, nil
@@ -133,11 +133,11 @@ func (s *memstoreImpl) Iterate(_ context.Context, req common.IteratePrm) (common
 		elem := common.IterationElement{
 			ObjectData: v,
 		}
-		if err := elem.Address.DecodeString(k); err != nil {
+		if err := elem.Address.DecodeString(string(k)); err != nil {
 			if req.IgnoreErrors {
 				continue
 			}
-			return common.IterateRes{}, logicerr.Wrap(fmt.Errorf("(%T) decoding address string %q: %v", s, k, err))
+			return common.IterateRes{}, logicerr.Wrap(fmt.Errorf("(%T) decoding address string %q: %v", s, string(k), err))
 		}
 		var err error
 		if elem.ObjectData, err = s.compression.Decompress(elem.ObjectData); err != nil {

pkg/local_object_storage/blobstor/mode.go

@@ -27,7 +27,7 @@ func (b *BlobStor) SetMode(ctx context.Context, m mode.Mode) error {
 		}
 	}
 	if err != nil {
-		return fmt.Errorf("set blobstor mode (old=%s, new=%s): %w", b.mode, m, err)
+		return fmt.Errorf("can't set blobstor mode (old=%s, new=%s): %w", b.mode, m, err)
 	}
 
 	b.mode = m

pkg/local_object_storage/blobstor/put.go

@@ -52,7 +52,7 @@ func (b *BlobStor) Put(ctx context.Context, prm common.PutPrm) (common.PutRes, e
 		// marshal object
 		data, err := prm.Object.Marshal()
 		if err != nil {
-			return common.PutRes{}, fmt.Errorf("marshal the object: %w", err)
+			return common.PutRes{}, fmt.Errorf("could not marshal the object: %w", err)
 		}
 		prm.RawData = data
 	}

pkg/local_object_storage/engine/container.go

@@ -48,8 +48,8 @@ func (e *StorageEngine) ContainerSize(ctx context.Context, prm ContainerSizePrm)
 	defer elapsed("ContainerSize", e.metrics.AddMethodDuration)()
 
 	err = e.execIfNotBlocked(func() error {
-		res = e.containerSize(ctx, prm)
-		return nil
+		res, err = e.containerSize(ctx, prm)
+		return err
 	})
 
 	return
@@ -69,7 +69,7 @@ func ContainerSize(ctx context.Context, e *StorageEngine, id cid.ID) (uint64, er
 	return res.Size(), nil
 }
 
-func (e *StorageEngine) containerSize(ctx context.Context, prm ContainerSizePrm) (res ContainerSizeRes) {
+func (e *StorageEngine) containerSize(ctx context.Context, prm ContainerSizePrm) (res ContainerSizeRes, err error) {
 	e.iterateOverUnsortedShards(func(sh hashedShard) (stop bool) {
 		var csPrm shard.ContainerSizePrm
 		csPrm.SetContainerID(prm.cnr)
@@ -96,8 +96,8 @@ func (e *StorageEngine) ListContainers(ctx context.Context, _ ListContainersPrm)
 	defer elapsed("ListContainers", e.metrics.AddMethodDuration)()
 
 	err = e.execIfNotBlocked(func() error {
-		res = e.listContainers(ctx)
-		return nil
+		res, err = e.listContainers(ctx)
+		return err
 	})
 
 	return
@@ -115,7 +115,7 @@ func ListContainers(ctx context.Context, e *StorageEngine) ([]cid.ID, error) {
 	return res.Containers(), nil
 }
 
-func (e *StorageEngine) listContainers(ctx context.Context) ListContainersRes {
+func (e *StorageEngine) listContainers(ctx context.Context) (ListContainersRes, error) {
 	uniqueIDs := make(map[string]cid.ID)
 
 	e.iterateOverUnsortedShards(func(sh hashedShard) (stop bool) {
@@ -142,5 +142,5 @@ func (e *StorageEngine) listContainers(ctx context.Context) ListContainersRes {
 
 	return ListContainersRes{
 		containers: result,
-	}
+	}, nil
 }

pkg/local_object_storage/engine/control.go

@@ -95,7 +95,7 @@ func (e *StorageEngine) Init(ctx context.Context) error {
 	err := eg.Wait()
 	close(errCh)
 	if err != nil {
-		return fmt.Errorf("initialize shards: %w", err)
+		return fmt.Errorf("failed to initialize shards: %w", err)
 	}
 
 	for res := range errCh {
@@ -117,7 +117,7 @@ func (e *StorageEngine) Init(ctx context.Context) error {
 
 				continue
 			}
-			return fmt.Errorf("initialize shard %s: %w", res.id, res.err)
+			return fmt.Errorf("could not initialize shard %s: %w", res.id, res.err)
 		}
 	}
 
@@ -320,7 +320,7 @@ loop:
 	for _, newID := range shardsToAdd {
 		sh, err := e.createShard(ctx, rcfg.shards[newID])
 		if err != nil {
-			return fmt.Errorf("add new shard with '%s' metabase path: %w", newID, err)
+			return fmt.Errorf("could not add new shard with '%s' metabase path: %w", newID, err)
 		}
 
 		idStr := sh.ID().String()
@@ -331,13 +331,13 @@ loop:
 		}
 		if err != nil {
 			_ = sh.Close(ctx)
-			return fmt.Errorf("init %s shard: %w", idStr, err)
+			return fmt.Errorf("could not init %s shard: %w", idStr, err)
 		}
 
 		err = e.addShard(sh)
 		if err != nil {
 			_ = sh.Close(ctx)
-			return fmt.Errorf("add %s shard: %w", idStr, err)
+			return fmt.Errorf("could not add %s shard: %w", idStr, err)
 		}
 
 		e.log.Info(ctx, logs.EngineAddedNewShard, zap.String("id", idStr))

pkg/local_object_storage/engine/delete.go

@@ -24,6 +24,9 @@ type DeletePrm struct {
 	forceRemoval bool
 }
 
+// DeleteRes groups the resulting values of Delete operation.
+type DeleteRes struct{}
+
 // WithAddress is a Delete option to set the addresses of the objects to delete.
 //
 // Option is required.
@@ -48,7 +51,7 @@ func (p *DeletePrm) WithForceRemoval() {
 // NOTE: Marks any object to be deleted (despite any prohibitions
 // on operations with that object) if WithForceRemoval option has
 // been provided.
-func (e *StorageEngine) Delete(ctx context.Context, prm DeletePrm) error {
+func (e *StorageEngine) Delete(ctx context.Context, prm DeletePrm) (res DeleteRes, err error) {
 	ctx, span := tracing.StartSpanFromContext(ctx, "StorageEngine.Delete",
 		trace.WithAttributes(
 			attribute.String("address", prm.addr.EncodeToString()),
@@ -57,12 +60,15 @@ func (e *StorageEngine) Delete(ctx context.Context, prm DeletePrm) error {
 	defer span.End()
 	defer elapsed("Delete", e.metrics.AddMethodDuration)()
 
-	return e.execIfNotBlocked(func() error {
-		return e.delete(ctx, prm)
+	err = e.execIfNotBlocked(func() error {
+		res, err = e.delete(ctx, prm)
+		return err
 	})
+
+	return
 }
 
-func (e *StorageEngine) delete(ctx context.Context, prm DeletePrm) error {
+func (e *StorageEngine) delete(ctx context.Context, prm DeletePrm) (DeleteRes, error) {
 	var locked struct {
 		is bool
 	}
@@ -120,14 +126,14 @@ func (e *StorageEngine) delete(ctx context.Context, prm DeletePrm) error {
 	})
 
 	if locked.is {
-		return new(apistatus.ObjectLocked)
+		return DeleteRes{}, new(apistatus.ObjectLocked)
 	}
 
 	if splitInfo != nil {
 		e.deleteChildren(ctx, prm.addr, prm.forceRemoval, splitInfo.SplitID())
 	}
 
-	return nil
+	return DeleteRes{}, nil
 }
 
 func (e *StorageEngine) deleteChildren(ctx context.Context, addr oid.Address, force bool, splitID *objectSDK.SplitID) {

pkg/local_object_storage/engine/delete_test.go

@@ -70,7 +70,8 @@ func TestDeleteBigObject(t *testing.T) {
 	deletePrm.WithForceRemoval()
 	deletePrm.WithAddress(addrParent)
 
-	require.NoError(t, e.Delete(context.Background(), deletePrm))
+	_, err := e.Delete(context.Background(), deletePrm)
+	require.NoError(t, err)
 
 	checkGetError[*apistatus.ObjectNotFound](t, e, addrParent, true)
 	checkGetError[*apistatus.ObjectNotFound](t, e, addrLink, true)
@@ -140,7 +141,8 @@ func TestDeleteBigObjectWithoutGC(t *testing.T) {
 	deletePrm.WithForceRemoval()
 	deletePrm.WithAddress(addrParent)
 
-	require.NoError(t, e.Delete(context.Background(), deletePrm))
+	_, err := e.Delete(context.Background(), deletePrm)
+	require.NoError(t, err)
 
 	checkGetError[*apistatus.ObjectNotFound](t, e, addrParent, true)
 	checkGetError[*apistatus.ObjectNotFound](t, e, addrLink, true)
@@ -151,7 +153,7 @@ func TestDeleteBigObjectWithoutGC(t *testing.T) {
 	// delete physical
 	var delPrm shard.DeletePrm
 	delPrm.SetAddresses(addrParent)
-	_, err := s1.Delete(context.Background(), delPrm)
+	_, err = s1.Delete(context.Background(), delPrm)
 	require.NoError(t, err)
 
 	delPrm.SetAddresses(addrLink)

pkg/local_object_storage/engine/evacuate.go

@@ -578,7 +578,7 @@ func (e *StorageEngine) evacuateTrees(ctx context.Context, sh *shard.Shard, tree
 
 func (e *StorageEngine) evacuateTreeToOtherNode(ctx context.Context, sh *shard.Shard, tree pilorama.ContainerIDTreeID, prm EvacuateShardPrm) (bool, string, error) {
 	if prm.TreeHandler == nil {
-		return false, "", fmt.Errorf("evacuate tree '%s' for container %s from shard %s: local evacuation failed, but no remote evacuation available", tree.TreeID, tree.CID, sh.ID())
+		return false, "", fmt.Errorf("failed to evacuate tree '%s' for container %s from shard %s: local evacuation failed, but no remote evacuation available", tree.TreeID, tree.CID, sh.ID())
 	}
 
 	return prm.TreeHandler(ctx, tree.CID, tree.TreeID, sh)
@@ -724,7 +724,7 @@ func (e *StorageEngine) getActualShards(shardIDs []string, prm EvacuateShardPrm)
 	shards := make([]pooledShard, 0, len(e.shards))
 	for id := range e.shards {
 		shards = append(shards, pooledShard{
-			hashedShard: e.shards[id],
+			hashedShard: hashedShard(e.shards[id]),
 			pool:        e.shardPools[id],
 		})
 	}

pkg/local_object_storage/engine/inhume.go

@@ -27,6 +27,9 @@ type InhumePrm struct {
 	forceRemoval bool
 }
 
+// InhumeRes encapsulates results of inhume operation.
+type InhumeRes struct{}
+
 // WithTarget sets a list of objects that should be inhumed and tombstone address
 // as the reason for inhume operation.
 //
@@ -64,20 +67,23 @@ var errInhumeFailure = errors.New("inhume operation failed")
 // with that object) if WithForceRemoval option has been provided.
 //
 // Returns an error if executions are blocked (see BlockExecution).
-func (e *StorageEngine) Inhume(ctx context.Context, prm InhumePrm) error {
+func (e *StorageEngine) Inhume(ctx context.Context, prm InhumePrm) (res InhumeRes, err error) {
 	ctx, span := tracing.StartSpanFromContext(ctx, "StorageEngine.Inhume")
 	defer span.End()
 	defer elapsed("Inhume", e.metrics.AddMethodDuration)()
 
-	return e.execIfNotBlocked(func() error {
-		return e.inhume(ctx, prm)
+	err = e.execIfNotBlocked(func() error {
+		res, err = e.inhume(ctx, prm)
+		return err
 	})
+
+	return
 }
 
-func (e *StorageEngine) inhume(ctx context.Context, prm InhumePrm) error {
+func (e *StorageEngine) inhume(ctx context.Context, prm InhumePrm) (InhumeRes, error) {
 	addrsPerShard, err := e.groupObjectsByShard(ctx, prm.addrs, !prm.forceRemoval)
 	if err != nil {
-		return err
+		return InhumeRes{}, err
 	}
 
 	var shPrm shard.InhumePrm
@@ -101,7 +107,7 @@ func (e *StorageEngine) inhume(ctx context.Context, prm InhumePrm) error {
 				zap.String("shard_id", shardID),
 				zap.String("trace_id", tracingPkg.GetTraceID(ctx)),
 			)
-			return errInhumeFailure
+			return InhumeRes{}, errInhumeFailure
 		}
 
 		if _, err := sh.Inhume(ctx, shPrm); err != nil {
@@ -113,11 +119,11 @@ func (e *StorageEngine) inhume(ctx context.Context, prm InhumePrm) error {
 			default:
 				e.reportShardError(ctx, sh, "couldn't inhume object in shard", err)
 			}
-			return err
+			return InhumeRes{}, err
 		}
 	}
 
-	return nil
+	return InhumeRes{}, nil
 }
 
 // groupObjectsByShard groups objects based on the shard(s) they are stored on.

pkg/local_object_storage/engine/inhume_test.go

@@ -55,7 +55,7 @@ func TestStorageEngine_Inhume(t *testing.T) {
 		var inhumePrm InhumePrm
 		inhumePrm.WithTarget(tombstoneID, object.AddressOf(parent))
 
-		err = e.Inhume(context.Background(), inhumePrm)
+		_, err = e.Inhume(context.Background(), inhumePrm)
 		require.NoError(t, err)
 
 		addrs, err := Select(context.Background(), e, cnr, false, fs)
@@ -85,7 +85,7 @@ func TestStorageEngine_Inhume(t *testing.T) {
 		var inhumePrm InhumePrm
 		inhumePrm.WithTarget(tombstoneID, object.AddressOf(parent))
 
-		err = e.Inhume(context.Background(), inhumePrm)
+		_, err = e.Inhume(context.Background(), inhumePrm)
 		require.NoError(t, err)
 
 		addrs, err := Select(context.Background(), e, cnr, false, fs)
@@ -128,7 +128,7 @@ func TestStorageEngine_ECInhume(t *testing.T) {
 
 	var inhumePrm InhumePrm
 	inhumePrm.WithTarget(tombstoneObjectAddress, parentObjectAddress)
-	err = e.Inhume(context.Background(), inhumePrm)
+	_, err = e.Inhume(context.Background(), inhumePrm)
 	require.NoError(t, err)
 
 	var alreadyRemoved *apistatus.ObjectAlreadyRemoved
@@ -173,7 +173,7 @@ func TestInhumeExpiredRegularObject(t *testing.T) {
 
 		var prm InhumePrm
 		prm.WithTarget(ts, object.AddressOf(obj))
-		err := engine.Inhume(context.Background(), prm)
+		_, err := engine.Inhume(context.Background(), prm)
 		require.NoError(t, err)
 	})
 
@@ -182,7 +182,7 @@ func TestInhumeExpiredRegularObject(t *testing.T) {
 
 		var prm InhumePrm
 		prm.MarkAsGarbage(object.AddressOf(obj))
-		err := engine.Inhume(context.Background(), prm)
+		_, err := engine.Inhume(context.Background(), prm)
 		require.NoError(t, err)
 	})
 }
@@ -237,7 +237,7 @@ func benchmarkInhumeMultipart(b *testing.B, numShards, numObjects int) {
 		prm.WithTarget(ts, addrs...)
 
 		b.StartTimer()
-		err := engine.Inhume(context.Background(), prm)
+		_, err := engine.Inhume(context.Background(), prm)
 		require.NoError(b, err)
 		b.StopTimer()
 	}

pkg/local_object_storage/engine/lock_test.go

@@ -114,7 +114,7 @@ func TestLockUserScenario(t *testing.T) {
 	inhumePrm.WithTarget(tombAddr, objAddr)
 
 	var objLockedErr *apistatus.ObjectLocked
-	err = e.Inhume(context.Background(), inhumePrm)
+	_, err = e.Inhume(context.Background(), inhumePrm)
 	require.ErrorAs(t, err, &objLockedErr)
 
 	// 4.
@@ -127,7 +127,7 @@ func TestLockUserScenario(t *testing.T) {
 
 	inhumePrm.WithTarget(tombForLockAddr, lockerAddr)
 
-	err = e.Inhume(context.Background(), inhumePrm)
+	_, err = e.Inhume(context.Background(), inhumePrm)
 	require.ErrorIs(t, err, meta.ErrLockObjectRemoval)
 
 	// 5.
@@ -136,7 +136,7 @@ func TestLockUserScenario(t *testing.T) {
 	inhumePrm.WithTarget(tombAddr, objAddr)
 
 	require.Eventually(t, func() bool {
-		err = e.Inhume(context.Background(), inhumePrm)
+		_, err = e.Inhume(context.Background(), inhumePrm)
 		return err == nil
 	}, 30*time.Second, time.Second)
 }
@@ -200,7 +200,7 @@ func TestLockExpiration(t *testing.T) {
 	inhumePrm.WithTarget(tombAddr, objectcore.AddressOf(obj))
 
 	var objLockedErr *apistatus.ObjectLocked
-	err = e.Inhume(context.Background(), inhumePrm)
+	_, err = e.Inhume(context.Background(), inhumePrm)
 	require.ErrorAs(t, err, &objLockedErr)
 
 	// 3.
@@ -212,7 +212,7 @@ func TestLockExpiration(t *testing.T) {
 	inhumePrm.WithTarget(tombAddr, objectcore.AddressOf(obj))
 
 	require.Eventually(t, func() bool {
-		err = e.Inhume(context.Background(), inhumePrm)
+		_, err = e.Inhume(context.Background(), inhumePrm)
 		return err == nil
 	}, 30*time.Second, time.Second)
 }
@@ -270,12 +270,12 @@ func TestLockForceRemoval(t *testing.T) {
 	inhumePrm.MarkAsGarbage(objectcore.AddressOf(obj))
 
 	var objLockedErr *apistatus.ObjectLocked
-	err = e.Inhume(context.Background(), inhumePrm)
+	_, err = e.Inhume(context.Background(), inhumePrm)
 	require.ErrorAs(t, err, &objLockedErr)
 
 	inhumePrm.WithTarget(oidtest.Address(), objectcore.AddressOf(obj))
 
-	err = e.Inhume(context.Background(), inhumePrm)
+	_, err = e.Inhume(context.Background(), inhumePrm)
 	require.ErrorAs(t, err, &objLockedErr)
 
 	// 4.
@@ -283,12 +283,13 @@ func TestLockForceRemoval(t *testing.T) {
 	deletePrm.WithAddress(objectcore.AddressOf(lock))
 	deletePrm.WithForceRemoval()
 
-	require.NoError(t, e.Delete(context.Background(), deletePrm))
+	_, err = e.Delete(context.Background(), deletePrm)
+	require.NoError(t, err)
 
 	// 5.
 	inhumePrm.MarkAsGarbage(objectcore.AddressOf(obj))
 
-	err = e.Inhume(context.Background(), inhumePrm)
+	_, err = e.Inhume(context.Background(), inhumePrm)
 	require.NoError(t, err)
 }
 

pkg/local_object_storage/engine/metrics.go

@@ -7,12 +7,34 @@ import (
 	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard/mode"
 )
 
-type (
-	MetricRegister    = metrics.EngineMetrics
-	GCMetrics         = metrics.GCMetrics
-	WriteCacheMetrics = metrics.WriteCacheMetrics
-	NullBool          = metrics.NullBool
-)
+type MetricRegister interface {
+	AddMethodDuration(method string, d time.Duration)
+
+	SetObjectCounter(shardID, objectType string, v uint64)
+	AddToObjectCounter(shardID, objectType string, delta int)
+
+	SetMode(shardID string, mode mode.Mode)
+
+	AddToContainerSize(cnrID string, size int64)
+	DeleteContainerSize(cnrID string)
+	DeleteContainerCount(cnrID string)
+	AddToPayloadCounter(shardID string, size int64)
+	IncErrorCounter(shardID string)
+	ClearErrorCounter(shardID string)
+	DeleteShardMetrics(shardID string)
+
+	SetContainerObjectCounter(shardID, contID, objectType string, v uint64)
+	IncContainerObjectCounter(shardID, contID, objectType string)
+	SubContainerObjectCounter(shardID, contID, objectType string, v uint64)
+
+	IncRefillObjectsCount(shardID, path string, size int, success bool)
+	SetRefillPercent(shardID, path string, percent uint32)
+	SetRefillStatus(shardID, path, status string)
+	SetEvacuationInProgress(shardID string, value bool)
+
+	WriteCache() metrics.WriteCacheMetrics
+	GC() metrics.GCMetrics
+}
 
 func elapsed(method string, addFunc func(method string, d time.Duration)) func() {
 	t := time.Now()
@@ -54,9 +76,9 @@ type (
 )
 
 var (
-	_ MetricRegister    = noopMetrics{}
-	_ WriteCacheMetrics = noopWriteCacheMetrics{}
-	_ GCMetrics         = noopGCMetrics{}
+	_ MetricRegister            = noopMetrics{}
+	_ metrics.WriteCacheMetrics = noopWriteCacheMetrics{}
+	_ metrics.GCMetrics         = noopGCMetrics{}
 )
 
 func (noopMetrics) AddMethodDuration(string, time.Duration)                  {}
@@ -77,8 +99,8 @@ func (noopMetrics) IncRefillObjectsCount(string, string, int, bool)          {}
 func (noopMetrics) SetRefillPercent(string, string, uint32)                  {}
 func (noopMetrics) SetRefillStatus(string, string, string)                   {}
 func (noopMetrics) SetEvacuationInProgress(string, bool)                     {}
-func (noopMetrics) WriteCache() WriteCacheMetrics                            { return noopWriteCacheMetrics{} }
-func (noopMetrics) GC() GCMetrics                                            { return noopGCMetrics{} }
+func (noopMetrics) WriteCache() metrics.WriteCacheMetrics                    { return noopWriteCacheMetrics{} }
+func (noopMetrics) GC() metrics.GCMetrics                                    { return noopGCMetrics{} }
 
 func (noopWriteCacheMetrics) AddMethodDuration(string, string, string, string, bool, time.Duration) {}
 func (noopWriteCacheMetrics) SetActualCount(string, string, string, uint64)                         {}

pkg/local_object_storage/engine/select.go

@@ -54,17 +54,19 @@ func (e *StorageEngine) Select(ctx context.Context, prm SelectPrm) (res SelectRe
 	defer elapsed("Select", e.metrics.AddMethodDuration)()
 
 	err = e.execIfNotBlocked(func() error {
-		res = e._select(ctx, prm)
-		return nil
+		res, err = e._select(ctx, prm)
+		return err
 	})
 
 	return
 }
 
-func (e *StorageEngine) _select(ctx context.Context, prm SelectPrm) SelectRes {
+func (e *StorageEngine) _select(ctx context.Context, prm SelectPrm) (SelectRes, error) {
 	addrList := make([]oid.Address, 0)
 	uniqueMap := make(map[string]struct{})
 
+	var outError error
+
 	var shPrm shard.SelectPrm
 	shPrm.SetContainerID(prm.cnr, prm.indexedContainer)
 	shPrm.SetFilters(prm.filters)
@@ -88,7 +90,7 @@ func (e *StorageEngine) _select(ctx context.Context, prm SelectPrm) SelectRes {
 
 	return SelectRes{
 		addrList: addrList,
-	}
+	}, outError
 }
 
 // List returns `limit` available physically storage object addresses in engine.
@@ -98,14 +100,14 @@ func (e *StorageEngine) _select(ctx context.Context, prm SelectPrm) SelectRes {
 func (e *StorageEngine) List(ctx context.Context, limit uint64) (res SelectRes, err error) {
 	defer elapsed("List", e.metrics.AddMethodDuration)()
 	err = e.execIfNotBlocked(func() error {
-		res = e.list(ctx, limit)
-		return nil
+		res, err = e.list(ctx, limit)
+		return err
 	})
 
 	return
 }
 
-func (e *StorageEngine) list(ctx context.Context, limit uint64) SelectRes {
+func (e *StorageEngine) list(ctx context.Context, limit uint64) (SelectRes, error) {
 	addrList := make([]oid.Address, 0, limit)
 	uniqueMap := make(map[string]struct{})
 	ln := uint64(0)
@@ -134,7 +136,7 @@ func (e *StorageEngine) list(ctx context.Context, limit uint64) SelectRes {
 
 	return SelectRes{
 		addrList: addrList,
-	}
+	}, nil
 }
 
 // Select selects objects from local storage using provided filters.

pkg/local_object_storage/engine/shards.go

@@ -108,12 +108,12 @@ func (m *metricsWithID) SetEvacuationInProgress(value bool) {
 func (e *StorageEngine) AddShard(ctx context.Context, opts ...shard.Option) (*shard.ID, error) {
 	sh, err := e.createShard(ctx, opts)
 	if err != nil {
-		return nil, fmt.Errorf("create a shard: %w", err)
+		return nil, fmt.Errorf("could not create a shard: %w", err)
 	}
 
 	err = e.addShard(sh)
 	if err != nil {
-		return nil, fmt.Errorf("add %s shard: %w", sh.ID().String(), err)
+		return nil, fmt.Errorf("could not add %s shard: %w", sh.ID().String(), err)
 	}
 
 	e.cfg.metrics.SetMode(sh.ID().String(), sh.GetMode())
@@ -124,7 +124,7 @@ func (e *StorageEngine) AddShard(ctx context.Context, opts ...shard.Option) (*sh
 func (e *StorageEngine) createShard(ctx context.Context, opts []shard.Option) (*shard.Shard, error) {
 	id, err := generateShardID()
 	if err != nil {
-		return nil, fmt.Errorf("generate shard ID: %w", err)
+		return nil, fmt.Errorf("could not generate shard ID: %w", err)
 	}
 
 	opts = e.appendMetrics(id, opts)
@@ -180,7 +180,7 @@ func (e *StorageEngine) addShard(sh *shard.Shard) error {
 
 	pool, err := ants.NewPool(int(e.shardPoolSize), ants.WithNonblocking(true))
 	if err != nil {
-		return fmt.Errorf("create pool: %w", err)
+		return fmt.Errorf("could not create pool: %w", err)
 	}
 
 	strID := sh.ID().String()
@@ -272,7 +272,7 @@ func (e *StorageEngine) sortShards(objAddr interface{ EncodeToString() string })
 	h := hrw.StringHash(objAddr.EncodeToString())
 	shards := make([]hashedShard, 0, len(e.shards))
 	for _, sh := range e.shards {
-		shards = append(shards, sh)
+		shards = append(shards, hashedShard(sh))
 	}
 	hrw.SortHasherSliceByValue(shards, h)
 	return shards
@@ -285,7 +285,7 @@ func (e *StorageEngine) unsortedShards() []hashedShard {
 	shards := make([]hashedShard, 0, len(e.shards))
 
 	for _, sh := range e.shards {
-		shards = append(shards, sh)
+		shards = append(shards, hashedShard(sh))
 	}
 
 	return shards
@@ -374,7 +374,7 @@ func (e *StorageEngine) closeShards(ctx context.Context, deletedShards []hashedS
 					zap.Error(err),
 				)
 				multiErrGuard.Lock()
-				multiErr = errors.Join(multiErr, fmt.Errorf("change shard (id:%s) mode to disabled: %w", sh.ID(), err))
+				multiErr = errors.Join(multiErr, fmt.Errorf("could not change shard (id:%s) mode to disabled: %w", sh.ID(), err))
 				multiErrGuard.Unlock()
 			}
 
@@ -385,7 +385,7 @@ func (e *StorageEngine) closeShards(ctx context.Context, deletedShards []hashedS
 					zap.Error(err),
 				)
 				multiErrGuard.Lock()
-				multiErr = errors.Join(multiErr, fmt.Errorf("close removed shard (id:%s): %w", sh.ID(), err))
+				multiErr = errors.Join(multiErr, fmt.Errorf("could not close removed shard (id:%s): %w", sh.ID(), err))
 				multiErrGuard.Unlock()
 			}
 			return nil

pkg/local_object_storage/metabase/containers.go

@@ -56,7 +56,7 @@ func (db *DB) containers(tx *bbolt.Tx) ([]cid.ID, error) {
 	return result, err
 }
 
-func (db *DB) ContainerSize(id cid.ID) (uint64, error) {
+func (db *DB) ContainerSize(id cid.ID) (size uint64, err error) {
 	db.modeMtx.RLock()
 	defer db.modeMtx.RUnlock()
 
@@ -64,22 +64,21 @@ func (db *DB) ContainerSize(id cid.ID) (uint64, error) {
 		return 0, ErrDegradedMode
 	}
 
-	var size uint64
-	err := db.boltDB.View(func(tx *bbolt.Tx) error {
-		size = db.containerSize(tx, id)
+	err = db.boltDB.View(func(tx *bbolt.Tx) error {
+		size, err = db.containerSize(tx, id)
 
-		return nil
+		return err
 	})
 
 	return size, metaerr.Wrap(err)
 }
 
-func (db *DB) containerSize(tx *bbolt.Tx, id cid.ID) uint64 {
+func (db *DB) containerSize(tx *bbolt.Tx, id cid.ID) (uint64, error) {
 	containerVolume := tx.Bucket(containerVolumeBucketName)
 	key := make([]byte, cidSize)
 	id.Encode(key)
 
-	return parseContainerSize(containerVolume.Get(key))
+	return parseContainerSize(containerVolume.Get(key)), nil
 }
 
 func parseContainerID(dst *cid.ID, name []byte, ignore map[string]struct{}) bool {

pkg/local_object_storage/metabase/control.go

@@ -54,7 +54,7 @@ func (db *DB) Open(ctx context.Context, m mode.Mode) error {
 func (db *DB) openDB(ctx context.Context, mode mode.Mode) error {
 	err := util.MkdirAllX(filepath.Dir(db.info.Path), db.info.Permission)
 	if err != nil {
-		return fmt.Errorf("create dir %s for metabase: %w", db.info.Path, err)
+		return fmt.Errorf("can't create dir %s for metabase: %w", db.info.Path, err)
 	}
 
 	db.log.Debug(ctx, logs.MetabaseCreatedDirectoryForMetabase, zap.String("path", db.info.Path))
@@ -73,7 +73,7 @@ func (db *DB) openBolt(ctx context.Context) error {
 
 	db.boltDB, err = bbolt.Open(db.info.Path, db.info.Permission, db.boltOptions)
 	if err != nil {
-		return fmt.Errorf("open boltDB database: %w", err)
+		return fmt.Errorf("can't open boltDB database: %w", err)
 	}
 	db.boltDB.MaxBatchDelay = db.boltBatchDelay
 	db.boltDB.MaxBatchSize = db.boltBatchSize
@@ -145,27 +145,27 @@ func (db *DB) init(reset bool) error {
 			if reset {
 				err := tx.DeleteBucket(name)
 				if err != nil && !errors.Is(err, bbolt.ErrBucketNotFound) {
-					return fmt.Errorf("delete static bucket %s: %w", k, err)
+					return fmt.Errorf("could not delete static bucket %s: %w", k, err)
 				}
 			}
 
 			_, err := tx.CreateBucketIfNotExists(name)
 			if err != nil {
-				return fmt.Errorf("create static bucket %s: %w", k, err)
+				return fmt.Errorf("could not create static bucket %s: %w", k, err)
 			}
 		}
 
 		for _, b := range deprecatedBuckets {
 			err := tx.DeleteBucket(b)
 			if err != nil && !errors.Is(err, bbolt.ErrBucketNotFound) {
-				return fmt.Errorf("delete deprecated bucket %s: %w", string(b), err)
+				return fmt.Errorf("could not delete deprecated bucket %s: %w", string(b), err)
 			}
 		}
 
 		if !reset { // counters will be recalculated by refill metabase
 			err = syncCounter(tx, false)
 			if err != nil {
-				return fmt.Errorf("sync object counter: %w", err)
+				return fmt.Errorf("could not sync object counter: %w", err)
 			}
 
 			return nil

pkg/local_object_storage/metabase/counter.go

@@ -238,26 +238,26 @@ func (db *DB) incCounters(tx *bbolt.Tx, cnrID cid.ID, isUserObject bool) error {
 	}
 
 	if err := db.updateShardObjectCounterBucket(b, phy, 1, true); err != nil {
-		return fmt.Errorf("increase phy object counter: %w", err)
+		return fmt.Errorf("could not increase phy object counter: %w", err)
 	}
 	if err := db.updateShardObjectCounterBucket(b, logical, 1, true); err != nil {
-		return fmt.Errorf("increase logical object counter: %w", err)
+		return fmt.Errorf("could not increase logical object counter: %w", err)
 	}
 	if isUserObject {
 		if err := db.updateShardObjectCounterBucket(b, user, 1, true); err != nil {
-			return fmt.Errorf("increase user object counter: %w", err)
+			return fmt.Errorf("could not increase user object counter: %w", err)
 		}
 	}
 	return db.incContainerObjectCounter(tx, cnrID, isUserObject)
 }
 
-func (db *DB) decShardObjectCounter(tx *bbolt.Tx, typ objectType, delta uint64) error {
+func (db *DB) updateShardObjectCounter(tx *bbolt.Tx, typ objectType, delta uint64, inc bool) error {
 	b := tx.Bucket(shardInfoBucket)
 	if b == nil {
 		return nil
 	}
 
-	return db.updateShardObjectCounterBucket(b, typ, delta, false)
+	return db.updateShardObjectCounterBucket(b, typ, delta, inc)
 }
 
 func (*DB) updateShardObjectCounterBucket(b *bbolt.Bucket, typ objectType, delta uint64, inc bool) error {
@@ -362,7 +362,7 @@ func (db *DB) incContainerObjectCounter(tx *bbolt.Tx, cnrID cid.ID, isUserObject
 func syncCounter(tx *bbolt.Tx, force bool) error {
 	shardInfoB, err := createBucketLikelyExists(tx, shardInfoBucket)
 	if err != nil {
-		return fmt.Errorf("get shard info bucket: %w", err)
+		return fmt.Errorf("could not get shard info bucket: %w", err)
 	}
 	shardObjectCounterInitialized := len(shardInfoB.Get(objectPhyCounterKey)) == 8 &&
 		len(shardInfoB.Get(objectLogicCounterKey)) == 8 &&
@@ -375,7 +375,7 @@ func syncCounter(tx *bbolt.Tx, force bool) error {
 
 	containerCounterB, err := createBucketLikelyExists(tx, containerCounterBucketName)
 	if err != nil {
-		return fmt.Errorf("get container counter bucket: %w", err)
+		return fmt.Errorf("could not get container counter bucket: %w", err)
 	}
 
 	var addr oid.Address
@@ -428,7 +428,7 @@ func syncCounter(tx *bbolt.Tx, force bool) error {
 		return nil
 	})
 	if err != nil {
-		return fmt.Errorf("iterate objects: %w", err)
+		return fmt.Errorf("could not iterate objects: %w", err)
 	}
 
 	return setObjectCounters(counters, shardInfoB, containerCounterB)
@@ -448,7 +448,7 @@ func setObjectCounters(counters map[cid.ID]ObjectCounters, shardInfoB, container
 		value := containerCounterValue(count)
 		err := containerCounterB.Put(key, value)
 		if err != nil {
-			return fmt.Errorf("update phy container object counter: %w", err)
+			return fmt.Errorf("could not update phy container object counter: %w", err)
 		}
 	}
 	phyData := make([]byte, 8)
@@ -456,7 +456,7 @@ func setObjectCounters(counters map[cid.ID]ObjectCounters, shardInfoB, container
 
 	err := shardInfoB.Put(objectPhyCounterKey, phyData)
 	if err != nil {
-		return fmt.Errorf("update phy object counter: %w", err)
+		return fmt.Errorf("could not update phy object counter: %w", err)
 	}
 
 	logData := make([]byte, 8)
@@ -464,7 +464,7 @@ func setObjectCounters(counters map[cid.ID]ObjectCounters, shardInfoB, container
 
 	err = shardInfoB.Put(objectLogicCounterKey, logData)
 	if err != nil {
-		return fmt.Errorf("update logic object counter: %w", err)
+		return fmt.Errorf("could not update logic object counter: %w", err)
 	}
 
 	userData := make([]byte, 8)
@@ -472,7 +472,7 @@ func setObjectCounters(counters map[cid.ID]ObjectCounters, shardInfoB, container
 
 	err = shardInfoB.Put(objectUserCounterKey, userData)
 	if err != nil {
-		return fmt.Errorf("update user object counter: %w", err)
+		return fmt.Errorf("could not update user object counter: %w", err)
 	}
 
 	return nil
@@ -492,7 +492,7 @@ func parseContainerCounterKey(buf []byte) (cid.ID, error) {
 	}
 	var cnrID cid.ID
 	if err := cnrID.Decode(buf); err != nil {
-		return cid.ID{}, fmt.Errorf("decode container ID: %w", err)
+		return cid.ID{}, fmt.Errorf("failed to decode container ID: %w", err)
 	}
 	return cnrID, nil
 }

pkg/local_object_storage/metabase/delete.go

@@ -161,28 +161,28 @@ func (db *DB) deleteGroup(tx *bbolt.Tx, addrs []oid.Address) (DeleteRes, error)
 
 func (db *DB) updateCountersDelete(tx *bbolt.Tx, res DeleteRes) error {
 	if res.phyCount > 0 {
-		err := db.decShardObjectCounter(tx, phy, res.phyCount)
+		err := db.updateShardObjectCounter(tx, phy, res.phyCount, false)
 		if err != nil {
-			return fmt.Errorf("decrease phy object counter: %w", err)
+			return fmt.Errorf("could not decrease phy object counter: %w", err)
 		}
 	}
 
 	if res.logicCount > 0 {
-		err := db.decShardObjectCounter(tx, logical, res.logicCount)
+		err := db.updateShardObjectCounter(tx, logical, res.logicCount, false)
 		if err != nil {
-			return fmt.Errorf("decrease logical object counter: %w", err)
+			return fmt.Errorf("could not decrease logical object counter: %w", err)
 		}
 	}
 
 	if res.userCount > 0 {
-		err := db.decShardObjectCounter(tx, user, res.userCount)
+		err := db.updateShardObjectCounter(tx, user, res.userCount, false)
 		if err != nil {
-			return fmt.Errorf("decrease user object counter: %w", err)
+			return fmt.Errorf("could not decrease user object counter: %w", err)
 		}
 	}
 
 	if err := db.updateContainerCounter(tx, res.removedByCnrID, false); err != nil {
-		return fmt.Errorf("decrease container object counter: %w", err)
+		return fmt.Errorf("could not decrease container object counter: %w", err)
 	}
 	return nil
 }
@@ -259,7 +259,7 @@ func (db *DB) delete(tx *bbolt.Tx, addr oid.Address, refCounter referenceCounter
 			if garbageBKT != nil {
 				err := garbageBKT.Delete(addrKey)
 				if err != nil {
-					return deleteSingleResult{}, fmt.Errorf("remove from garbage bucket: %w", err)
+					return deleteSingleResult{}, fmt.Errorf("could not remove from garbage bucket: %w", err)
 				}
 			}
 			return deleteSingleResult{}, nil
@@ -280,7 +280,7 @@ func (db *DB) delete(tx *bbolt.Tx, addr oid.Address, refCounter referenceCounter
 	if garbageBKT != nil {
 		err := garbageBKT.Delete(addrKey)
 		if err != nil {
-			return deleteSingleResult{}, fmt.Errorf("remove from garbage bucket: %w", err)
+			return deleteSingleResult{}, fmt.Errorf("could not remove from garbage bucket: %w", err)
 		}
 	}
 
@@ -308,7 +308,7 @@ func (db *DB) delete(tx *bbolt.Tx, addr oid.Address, refCounter referenceCounter
 	// remove object
 	err = db.deleteObject(tx, obj, false)
 	if err != nil {
-		return deleteSingleResult{}, fmt.Errorf("remove object: %w", err)
+		return deleteSingleResult{}, fmt.Errorf("could not remove object: %w", err)
 	}
 
 	if err := deleteECRelatedInfo(tx, garbageBKT, obj, addr.Container(), refCounter); err != nil {
@@ -335,12 +335,12 @@ func (db *DB) deleteObject(
 
 	err = updateListIndexes(tx, obj, delListIndexItem)
 	if err != nil {
-		return fmt.Errorf("remove list indexes: %w", err)
+		return fmt.Errorf("can't remove list indexes: %w", err)
 	}
 
 	err = updateFKBTIndexes(tx, obj, delFKBTIndexItem)
 	if err != nil {
-		return fmt.Errorf("remove fake bucket tree indexes: %w", err)
+		return fmt.Errorf("can't remove fake bucket tree indexes: %w", err)
 	}
 
 	if isParent {
@@ -351,7 +351,7 @@ func (db *DB) deleteObject(
 			addrKey := addressKey(object.AddressOf(obj), key)
 			err := garbageBKT.Delete(addrKey)
 			if err != nil {
-				return fmt.Errorf("remove from garbage bucket: %w", err)
+				return fmt.Errorf("could not remove from garbage bucket: %w", err)
 			}
 		}
 	}
@@ -529,7 +529,7 @@ func deleteECRelatedInfo(tx *bbolt.Tx, garbageBKT *bbolt.Bucket, obj *objectSDK.
 		addrKey := addressKey(ecParentAddress, make([]byte, addressKeySize))
 		err := garbageBKT.Delete(addrKey)
 		if err != nil {
-			return fmt.Errorf("remove EC parent from garbage bucket: %w", err)
+			return fmt.Errorf("could not remove EC parent from garbage bucket: %w", err)
 		}
 	}
 
@@ -567,7 +567,7 @@ func deleteECRelatedInfo(tx *bbolt.Tx, garbageBKT *bbolt.Bucket, obj *objectSDK.
 		addrKey := addressKey(splitParentAddress, make([]byte, addressKeySize))
 		err := garbageBKT.Delete(addrKey)
 		if err != nil {
-			return fmt.Errorf("remove EC parent from garbage bucket: %w", err)
+			return fmt.Errorf("could not remove EC parent from garbage bucket: %w", err)
 		}
 	}
 

pkg/local_object_storage/metabase/exists.go

@@ -1,6 +1,7 @@
 package meta
 
 import (
+	"bytes"
 	"context"
 	"fmt"
 	"time"
@@ -226,9 +227,9 @@ func getSplitInfo(tx *bbolt.Tx, cnr cid.ID, key []byte) (*objectSDK.SplitInfo, e
 
 	splitInfo := objectSDK.NewSplitInfo()
 
-	err := splitInfo.Unmarshal(rawSplitInfo)
+	err := splitInfo.Unmarshal(bytes.Clone(rawSplitInfo))
 	if err != nil {
-		return nil, fmt.Errorf("unmarshal split info from root index: %w", err)
+		return nil, fmt.Errorf("can't unmarshal split info from root index: %w", err)
 	}
 
 	return splitInfo, nil

pkg/local_object_storage/metabase/get.go

@@ -1,6 +1,7 @@
 package meta
 
 import (
+	"bytes"
 	"context"
 	"fmt"
 	"time"
@@ -111,7 +112,7 @@ func (db *DB) get(tx *bbolt.Tx, addr oid.Address, key []byte, checkStatus, raw b
 	// check in primary index
 	data := getFromBucket(tx, primaryBucketName(cnr, bucketName), key)
 	if len(data) != 0 {
-		return obj, obj.Unmarshal(data)
+		return obj, obj.Unmarshal(bytes.Clone(data))
 	}
 
 	data = getFromBucket(tx, ecInfoBucketName(cnr, bucketName), key)
@@ -122,13 +123,13 @@ func (db *DB) get(tx *bbolt.Tx, addr oid.Address, key []byte, checkStatus, raw b
 	// if not found then check in tombstone index
 	data = getFromBucket(tx, tombstoneBucketName(cnr, bucketName), key)
 	if len(data) != 0 {
-		return obj, obj.Unmarshal(data)
+		return obj, obj.Unmarshal(bytes.Clone(data))
 	}
 
 	// if not found then check in locker index
 	data = getFromBucket(tx, bucketNameLockers(cnr, bucketName), key)
 	if len(data) != 0 {
-		return obj, obj.Unmarshal(data)
+		return obj, obj.Unmarshal(bytes.Clone(data))
 	}
 
 	// if not found then check if object is a virtual
@@ -184,9 +185,9 @@ func getVirtualObject(tx *bbolt.Tx, cnr cid.ID, key []byte, raw bool) (*objectSD
 
 	child := objectSDK.New()
 
-	err = child.Unmarshal(data)
+	err = child.Unmarshal(bytes.Clone(data))
 	if err != nil {
-		return nil, fmt.Errorf("unmarshal child with parent: %w", err)
+		return nil, fmt.Errorf("can't unmarshal child with parent: %w", err)
 	}
 
 	par := child.Parent()
@@ -218,7 +219,7 @@ func getECInfoError(tx *bbolt.Tx, cnr cid.ID, data []byte) error {
 		objData := getFromBucket(tx, primaryBucketName(cnr, make([]byte, bucketKeySize)), key)
 		if len(objData) != 0 {
 			obj := objectSDK.New()
-			if err := obj.Unmarshal(objData); err != nil {
+			if err := obj.Unmarshal(bytes.Clone(objData)); err != nil {
 				return err
 			}
 			chunk := objectSDK.ECChunk{}

pkg/local_object_storage/metabase/graveyard.go

@@ -177,7 +177,7 @@ type gcHandler struct {
 func (g gcHandler) handleKV(k, _ []byte) error {
 	o, err := garbageFromKV(k)
 	if err != nil {
-		return fmt.Errorf("parse garbage object: %w", err)
+		return fmt.Errorf("could not parse garbage object: %w", err)
 	}
 
 	return g.h(o)
@@ -190,7 +190,7 @@ type graveyardHandler struct {
 func (g graveyardHandler) handleKV(k, v []byte) error {
 	o, err := graveFromKV(k, v)
 	if err != nil {
-		return fmt.Errorf("parse grave: %w", err)
+		return fmt.Errorf("could not parse grave: %w", err)
 	}
 
 	return g.h(o)
@@ -240,7 +240,7 @@ func (db *DB) iterateDeletedObj(tx *bbolt.Tx, h kvHandler, offset *oid.Address)
 func garbageFromKV(k []byte) (res GarbageObject, err error) {
 	err = decodeAddressFromKey(&res.addr, k)
 	if err != nil {
-		err = fmt.Errorf("parse address: %w", err)
+		err = fmt.Errorf("could not parse address: %w", err)
 	}
 
 	return

pkg/local_object_storage/metabase/inhume.go

@@ -342,10 +342,10 @@ func (db *DB) inhumeECInfo(tx *bbolt.Tx, epoch uint64, tomb *oid.Address, res *I
 }
 
 func (db *DB) applyInhumeResToCounters(tx *bbolt.Tx, res *InhumeRes) error {
-	if err := db.decShardObjectCounter(tx, logical, res.LogicInhumed()); err != nil {
+	if err := db.updateShardObjectCounter(tx, logical, res.LogicInhumed(), false); err != nil {
 		return err
 	}
-	if err := db.decShardObjectCounter(tx, user, res.UserInhumed()); err != nil {
+	if err := db.updateShardObjectCounter(tx, user, res.UserInhumed(), false); err != nil {
 		return err
 	}
 
@@ -373,7 +373,7 @@ func (db *DB) getInhumeTargetBucketAndValue(garbageBKT, graveyardBKT *bbolt.Buck
 		if data != nil {
 			err := targetBucket.Delete(tombKey)
 			if err != nil {
-				return nil, nil, fmt.Errorf("remove grave with tombstone key: %w", err)
+				return nil, nil, fmt.Errorf("could not remove grave with tombstone key: %w", err)
 			}
 		}
 

pkg/local_object_storage/metabase/iterators.go

@@ -1,6 +1,7 @@
 package meta
 
 import (
+	"bytes"
 	"context"
 	"errors"
 	"strconv"
@@ -129,7 +130,7 @@ func iteratePhyObjects(tx *bbolt.Tx, f func(cid.ID, oid.ID, *objectSDK.Object) e
 		}
 
 		return b.ForEach(func(k, v []byte) error {
-			if oid.Decode(k) == nil && obj.Unmarshal(v) == nil {
+			if oid.Decode(k) == nil && obj.Unmarshal(bytes.Clone(v)) == nil {
 				return f(cid, oid, obj)
 			}
 

pkg/local_object_storage/metabase/list.go

@@ -87,8 +87,7 @@ type CountAliveObjectsInContainerPrm struct {
 }
 
 // ListWithCursor lists physical objects available in metabase starting from
-// cursor. Includes objects of all types. Does not include inhumed and expired
-// objects.
+// cursor. Includes objects of all types. Does not include inhumed objects.
 // Use cursor value from response for consecutive requests.
 //
 // Returns ErrEndOfListing if there are no more objects to return or count
@@ -144,8 +143,6 @@ func (db *DB) listWithCursor(tx *bbolt.Tx, result []objectcore.Info, count int,
 
 	rawAddr := make([]byte, cidSize, addressKeySize)
 
-	currEpoch := db.epochState.CurrentEpoch()
-
 loop:
 	for ; name != nil; name, _ = c.Next() {
 		cidRaw, prefix := parseContainerIDWithPrefix(&containerID, name)
@@ -170,7 +167,7 @@ loop:
 		if bkt != nil {
 			copy(rawAddr, cidRaw)
 			result, offset, cursor, err = selectNFromBucket(bkt, objType, graveyardBkt, garbageBkt, rawAddr, containerID,
-				result, count, cursor, threshold, currEpoch)
+				result, count, cursor, threshold)
 			if err != nil {
 				return nil, nil, err
 			}
@@ -215,7 +212,6 @@ func selectNFromBucket(bkt *bbolt.Bucket, // main bucket
 	limit int, // stop listing at `limit` items in result
 	cursor *Cursor, // start from cursor object
 	threshold bool, // ignore cursor and start immediately
-	currEpoch uint64,
 ) ([]objectcore.Info, []byte, *Cursor, error) {
 	if cursor == nil {
 		cursor = new(Cursor)
@@ -247,19 +243,13 @@ func selectNFromBucket(bkt *bbolt.Bucket, // main bucket
 			continue
 		}
 
-		var o objectSDK.Object
-		if err := o.Unmarshal(v); err != nil {
-			return nil, nil, nil, err
-		}
-
-		expEpoch, hasExpEpoch := hasExpirationEpoch(&o)
-		if !objectLocked(bkt.Tx(), cnt, obj) && hasExpEpoch && expEpoch < currEpoch {
-			continue
-		}
-
 		var isLinkingObj bool
 		var ecInfo *objectcore.ECInfo
 		if objType == objectSDK.TypeRegular {
+			var o objectSDK.Object
+			if err := o.Unmarshal(bytes.Clone(v)); err != nil {
+				return nil, nil, nil, err
+			}
 			isLinkingObj = isLinkObject(&o)
 			ecHeader := o.ECHeader()
 			if ecHeader != nil {
@@ -423,7 +413,7 @@ func (db *DB) iterateOverObjectsInContainer(ctx context.Context, tx *bbolt.Tx, p
 		var ecInfo *objectcore.ECInfo
 		if prm.ObjectType == objectSDK.TypeRegular {
 			var o objectSDK.Object
-			if err := o.Unmarshal(v); err != nil {
+			if err := o.Unmarshal(bytes.Clone(v)); err != nil {
 				return err
 			}
 			isLinkingObj = isLinkObject(&o)

pkg/local_object_storage/metabase/list_test.go

@@ -3,17 +3,14 @@ package meta_test
 import (
 	"context"
 	"errors"
-	"strconv"
 	"testing"
 
 	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/object"
 	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/internal/testutil"
 	meta "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase"
-	objectV2 "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/api/object"
 	cidSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id"
 	cidtest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id/test"
 	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"
 	"github.com/stretchr/testify/require"
 	"go.etcd.io/bbolt"
@@ -74,16 +71,14 @@ func benchmarkListWithCursor(b *testing.B, db *meta.DB, batchSize int) {
 func TestLisObjectsWithCursor(t *testing.T) {
 	t.Parallel()
 
-	const (
-		currEpoch  = 100
-		expEpoch   = currEpoch - 1
-		containers = 5
-		total      = containers * 6 // regular + ts + child + lock + non-expired regular + locked expired
-	)
-
-	db := newDB(t, meta.WithEpochState(epochState{currEpoch}))
+	db := newDB(t)
 	defer func() { require.NoError(t, db.Close(context.Background())) }()
 
+	const (
+		containers = 5
+		total      = containers * 4 // regular + ts + child + lock
+	)
+
 	expected := make([]object.Info, 0, total)
 
 	// fill metabase with objects
@@ -132,26 +127,6 @@ func TestLisObjectsWithCursor(t *testing.T) {
 		err = putBig(db, child)
 		require.NoError(t, err)
 		expected = append(expected, object.Info{Address: object.AddressOf(child), Type: objectSDK.TypeRegular})
-
-		// add expired object (do not include into expected)
-		obj = testutil.GenerateObjectWithCID(containerID)
-		testutil.AddAttribute(obj, objectV2.SysAttributeExpEpoch, strconv.Itoa(expEpoch))
-		require.NoError(t, metaPut(db, obj, nil))
-
-		// add non-expired object (include into expected)
-		obj = testutil.GenerateObjectWithCID(containerID)
-		testutil.AddAttribute(obj, objectV2.SysAttributeExpEpoch, strconv.Itoa(currEpoch))
-		require.NoError(t, metaPut(db, obj, nil))
-		expected = append(expected, object.Info{Address: object.AddressOf(obj), Type: objectSDK.TypeRegular})
-
-		// add locked expired object (include into expected)
-		obj = testutil.GenerateObjectWithCID(containerID)
-		objID := oidtest.ID()
-		obj.SetID(objID)
-		testutil.AddAttribute(obj, objectV2.SysAttributeExpEpoch, strconv.Itoa(expEpoch))
-		require.NoError(t, metaPut(db, obj, nil))
-		require.NoError(t, db.Lock(context.Background(), containerID, oidtest.ID(), []oid.ID{objID}))
-		expected = append(expected, object.Info{Address: object.AddressOf(obj), Type: objectSDK.TypeRegular})
 	}
 
 	t.Run("success with various count", func(t *testing.T) {

pkg/local_object_storage/metabase/mode.go

@@ -19,7 +19,7 @@ func (db *DB) SetMode(ctx context.Context, m mode.Mode) error {
 
 	if !db.mode.NoMetabase() {
 		if err := db.Close(ctx); err != nil {
-			return fmt.Errorf("set metabase mode (old=%s, new=%s): %w", db.mode, m, err)
+			return fmt.Errorf("can't set metabase mode (old=%s, new=%s): %w", db.mode, m, err)
 		}
 	}
 
@@ -31,7 +31,7 @@ func (db *DB) SetMode(ctx context.Context, m mode.Mode) error {
 			err = db.Init(ctx)
 		}
 		if err != nil {
-			return fmt.Errorf("set metabase mode (old=%s, new=%s): %w", db.mode, m, err)
+			return fmt.Errorf("can't set metabase mode (old=%s, new=%s): %w", db.mode, m, err)
 		}
 	}
 

pkg/local_object_storage/metabase/put.go

@@ -1,6 +1,7 @@
 package meta
 
 import (
+	"bytes"
 	"context"
 	"encoding/binary"
 	"errors"
@@ -179,18 +180,18 @@ func (db *DB) insertObject(tx *bbolt.Tx, obj *objectSDK.Object, id []byte, si *o
 
 	err := putUniqueIndexes(tx, obj, si, id)
 	if err != nil {
-		return fmt.Errorf("put unique indexes: %w", err)
+		return fmt.Errorf("can't put unique indexes: %w", err)
 	}
 
 	err = updateListIndexes(tx, obj, putListIndexItem)
 	if err != nil {
-		return fmt.Errorf("put list indexes: %w", err)
+		return fmt.Errorf("can't put list indexes: %w", err)
 	}
 
 	if indexAttributes {
 		err = updateFKBTIndexes(tx, obj, putFKBTIndexItem)
 		if err != nil {
-			return fmt.Errorf("put fake bucket tree indexes: %w", err)
+			return fmt.Errorf("can't put fake bucket tree indexes: %w", err)
 		}
 	}
 
@@ -249,7 +250,7 @@ func putRawObjectData(tx *bbolt.Tx, obj *objectSDK.Object, bucketName []byte, ad
 	}
 	rawObject, err := obj.CutPayload().Marshal()
 	if err != nil {
-		return fmt.Errorf("marshal object header: %w", err)
+		return fmt.Errorf("can't marshal object header: %w", err)
 	}
 	return putUniqueIndexItem(tx, namedBucketItem{
 		name: bucketName,
@@ -319,7 +320,7 @@ func updateSplitInfoIndex(tx *bbolt.Tx, objKey []byte, cnr cid.ID, bucketName []
 			return si.Marshal()
 		default:
 			oldSI := objectSDK.NewSplitInfo()
-			if err := oldSI.Unmarshal(old); err != nil {
+			if err := oldSI.Unmarshal(bytes.Clone(old)); err != nil {
 				return nil, err
 			}
 			si = util.MergeSplitInfo(si, oldSI)
@@ -474,7 +475,7 @@ func createBucketLikelyExists[T bucketContainer](tx T, name []byte) (*bbolt.Buck
 func updateUniqueIndexItem(tx *bbolt.Tx, item namedBucketItem, update func(oldData, newData []byte) ([]byte, error)) error {
 	bkt, err := createBucketLikelyExists(tx, item.name)
 	if err != nil {
-		return fmt.Errorf("create index %v: %w", item.name, err)
+		return fmt.Errorf("can't create index %v: %w", item.name, err)
 	}
 
 	data, err := update(bkt.Get(item.key), item.val)
@@ -491,12 +492,12 @@ func putUniqueIndexItem(tx *bbolt.Tx, item namedBucketItem) error {
 func putFKBTIndexItem(tx *bbolt.Tx, item namedBucketItem) error {
 	bkt, err := createBucketLikelyExists(tx, item.name)
 	if err != nil {
-		return fmt.Errorf("create index %v: %w", item.name, err)
+		return fmt.Errorf("can't create index %v: %w", item.name, err)
 	}
 
 	fkbtRoot, err := createBucketLikelyExists(bkt, item.key)
 	if err != nil {
-		return fmt.Errorf("create fake bucket tree index %v: %w", item.key, err)
+		return fmt.Errorf("can't create fake bucket tree index %v: %w", item.key, err)
 	}
 
 	return fkbtRoot.Put(item.val, zeroValue)
@@ -505,19 +506,19 @@ func putFKBTIndexItem(tx *bbolt.Tx, item namedBucketItem) error {
 func putListIndexItem(tx *bbolt.Tx, item namedBucketItem) error {
 	bkt, err := createBucketLikelyExists(tx, item.name)
 	if err != nil {
-		return fmt.Errorf("create index %v: %w", item.name, err)
+		return fmt.Errorf("can't create index %v: %w", item.name, err)
 	}
 
 	lst, err := decodeList(bkt.Get(item.key))
 	if err != nil {
-		return fmt.Errorf("decode leaf list %v: %w", item.key, err)
+		return fmt.Errorf("can't decode leaf list %v: %w", item.key, err)
 	}
 
 	lst = append(lst, item.val)
 
 	encodedLst, err := encodeList(lst)
 	if err != nil {
-		return fmt.Errorf("encode leaf list %v: %w", item.key, err)
+		return fmt.Errorf("can't encode leaf list %v: %w", item.key, err)
 	}
 
 	return bkt.Put(item.key, encodedLst)

pkg/local_object_storage/metabase/select.go

@@ -565,7 +565,7 @@ func groupFilters(filters objectSDK.SearchFilters, useAttributeIndex bool) (filt
 		case v2object.FilterHeaderContainerID: // support deprecated field
 			err := res.cnr.DecodeString(filters[i].Value())
 			if err != nil {
-				return filterGroup{}, fmt.Errorf("parse container id: %w", err)
+				return filterGroup{}, fmt.Errorf("can't parse container id: %w", err)
 			}
 
 			res.withCnrFilter = true

pkg/local_object_storage/metabase/shard_id.go

@@ -32,13 +32,13 @@ func (db *DB) GetShardID(ctx context.Context, mode metamode.Mode) ([]byte, error
 	}
 
 	if err := db.openDB(ctx, mode); err != nil {
-		return nil, fmt.Errorf("open metabase: %w", err)
+		return nil, fmt.Errorf("failed to open metabase: %w", err)
 	}
 
 	id, err := db.readShardID()
 
 	if cErr := db.close(); cErr != nil {
-		err = errors.Join(err, fmt.Errorf("close metabase: %w", cErr))
+		err = errors.Join(err, fmt.Errorf("failed to close metabase: %w", cErr))
 	}
 
 	return id, metaerr.Wrap(err)
@@ -70,7 +70,7 @@ func (db *DB) SetShardID(ctx context.Context, id []byte, mode metamode.Mode) err
 	}
 
 	if err := db.openDB(ctx, mode); err != nil {
-		return fmt.Errorf("open metabase: %w", err)
+		return fmt.Errorf("failed to open metabase: %w", err)
 	}
 
 	err := db.writeShardID(id)
@@ -79,7 +79,7 @@ func (db *DB) SetShardID(ctx context.Context, id []byte, mode metamode.Mode) err
 	}
 
 	if cErr := db.close(); cErr != nil {
-		err = errors.Join(err, fmt.Errorf("close metabase: %w", cErr))
+		err = errors.Join(err, fmt.Errorf("failed to close metabase: %w", cErr))
 	}
 
 	return metaerr.Wrap(err)

pkg/local_object_storage/metabase/storage_id.go

@@ -35,7 +35,7 @@ func (r StorageIDRes) StorageID() []byte {
 
 // StorageID returns storage descriptor for objects from the blobstor.
 // It is put together with the object can makes get/delete operation faster.
-func (db *DB) StorageID(ctx context.Context, prm StorageIDPrm) (StorageIDRes, error) {
+func (db *DB) StorageID(ctx context.Context, prm StorageIDPrm) (res StorageIDRes, err error) {
 	var (
 		startedAt = time.Now()
 		success   = false
@@ -53,32 +53,32 @@ func (db *DB) StorageID(ctx context.Context, prm StorageIDPrm) (StorageIDRes, er
 	db.modeMtx.RLock()
 	defer db.modeMtx.RUnlock()
 
-	var res StorageIDRes
 	if db.mode.NoMetabase() {
 		return res, ErrDegradedMode
 	}
 
-	err := db.boltDB.View(func(tx *bbolt.Tx) error {
-		res.id = db.storageID(tx, prm.addr)
-		return nil
+	err = db.boltDB.View(func(tx *bbolt.Tx) error {
+		res.id, err = db.storageID(tx, prm.addr)
+
+		return err
 	})
 	success = err == nil
 	return res, metaerr.Wrap(err)
 }
 
-func (db *DB) storageID(tx *bbolt.Tx, addr oid.Address) []byte {
+func (db *DB) storageID(tx *bbolt.Tx, addr oid.Address) ([]byte, error) {
 	key := make([]byte, bucketKeySize)
 	smallBucket := tx.Bucket(smallBucketName(addr.Container(), key))
 	if smallBucket == nil {
-		return nil
+		return nil, nil
 	}
 
 	storageID := smallBucket.Get(objectKey(addr.Object(), key))
 	if storageID == nil {
-		return nil
+		return nil, nil
 	}
 
-	return bytes.Clone(storageID)
+	return bytes.Clone(storageID), nil
 }
 
 // UpdateStorageIDPrm groups the parameters of UpdateStorageID operation.

pkg/local_object_storage/metabase/upgrade.go

@@ -95,7 +95,7 @@ func compactDB(db *bbolt.DB) error {
 		NoSync:  true,
 	})
 	if err != nil {
-		return fmt.Errorf("open new metabase to compact: %w", err)
+		return fmt.Errorf("can't open new metabase to compact: %w", err)
 	}
 	if err := bbolt.Compact(dst, db, compactMaxTxSize); err != nil {
 		return fmt.Errorf("compact metabase: %w", errors.Join(err, dst.Close(), os.Remove(tmpFileName)))
@@ -292,7 +292,7 @@ func iterateExpirationAttributeKeyBucket(ctx context.Context, b *bbolt.Bucket, i
 		}
 		expirationEpoch, err := strconv.ParseUint(string(attrValue), 10, 64)
 		if err != nil {
-			return fmt.Errorf("parse expiration epoch: %w", err)
+			return fmt.Errorf("could not parse expiration epoch: %w", err)
 		}
 		expirationEpochBucket := b.Bucket(attrValue)
 		attrKeyValueC := expirationEpochBucket.Cursor()
@@ -399,7 +399,7 @@ func selectUserAttributeKeysToDrop(keys [][]byte, cs container.InfoProvider) ([]
 	for _, key := range keys {
 		attr, ok := attributeFromAttributeBucket(key)
 		if !ok {
-			return nil, fmt.Errorf("parse attribute key from user attribute bucket key %s", hex.EncodeToString(key))
+			return nil, fmt.Errorf("failed to parse attribute key from user attribute bucket key %s", hex.EncodeToString(key))
 		}
 		if !IsAtrributeIndexed(attr) {
 			keysToDrop = append(keysToDrop, key)
@@ -407,7 +407,7 @@ func selectUserAttributeKeysToDrop(keys [][]byte, cs container.InfoProvider) ([]
 		}
 		contID, ok := cidFromAttributeBucket(key)
 		if !ok {
-			return nil, fmt.Errorf("parse container ID from user attribute bucket key %s", hex.EncodeToString(key))
+			return nil, fmt.Errorf("failed to parse container ID from user attribute bucket key %s", hex.EncodeToString(key))
 		}
 		info, err := cs.Info(contID)
 		if err != nil {

pkg/local_object_storage/metabase/util.go

@@ -231,11 +231,11 @@ func parseExpirationEpochKey(key []byte) (uint64, cid.ID, oid.ID, error) {
 	epoch := binary.BigEndian.Uint64(key)
 	var cnr cid.ID
 	if err := cnr.Decode(key[epochSize : epochSize+cidSize]); err != nil {
-		return 0, cid.ID{}, oid.ID{}, fmt.Errorf("decode expiration epoch to object key (container ID): %w", err)
+		return 0, cid.ID{}, oid.ID{}, fmt.Errorf("failed to decode expiration epoch to object key (container ID): %w", err)
 	}
 	var obj oid.ID
 	if err := obj.Decode(key[epochSize+cidSize:]); err != nil {
-		return 0, cid.ID{}, oid.ID{}, fmt.Errorf("decode expiration epoch to object key (object ID): %w", err)
+		return 0, cid.ID{}, oid.ID{}, fmt.Errorf("failed to decode expiration epoch to object key (object ID): %w", err)
 	}
 	return epoch, cnr, obj, nil
 }

pkg/local_object_storage/metabase/version.go

@@ -67,7 +67,7 @@ func updateVersion(tx *bbolt.Tx, version uint64) error {
 
 	b, err := tx.CreateBucketIfNotExists(shardInfoBucket)
 	if err != nil {
-		return fmt.Errorf("create auxiliary bucket: %w", err)
+		return fmt.Errorf("can't create auxiliary bucket: %w", err)
 	}
 	return b.Put(versionKey, data)
 }

pkg/local_object_storage/pilorama/boltdb.go

@@ -106,7 +106,7 @@ func (t *boltForest) SetMode(ctx context.Context, m mode.Mode) error {
 		}
 	}
 	if err != nil {
-		return fmt.Errorf("set pilorama mode (old=%s, new=%s): %w", t.mode, m, err)
+		return fmt.Errorf("can't set pilorama mode (old=%s, new=%s): %w", t.mode, m, err)
 	}
 
 	t.mode = m
@@ -128,7 +128,7 @@ func (t *boltForest) openBolt(m mode.Mode) error {
 	readOnly := m.ReadOnly()
 	err := util.MkdirAllX(filepath.Dir(t.path), t.perm)
 	if err != nil {
-		return metaerr.Wrap(fmt.Errorf("create dir %s for the pilorama: %w", t.path, err))
+		return metaerr.Wrap(fmt.Errorf("can't create dir %s for the pilorama: %w", t.path, err))
 	}
 
 	opts := *bbolt.DefaultOptions
@@ -139,7 +139,7 @@ func (t *boltForest) openBolt(m mode.Mode) error {
 
 	t.db, err = bbolt.Open(t.path, t.perm, &opts)
 	if err != nil {
-		return metaerr.Wrap(fmt.Errorf("open the pilorama DB: %w", err))
+		return metaerr.Wrap(fmt.Errorf("can't open the pilorama DB: %w", err))
 	}
 
 	t.db.MaxBatchSize = t.maxBatchSize
@@ -419,7 +419,10 @@ func (t *boltForest) addByPathInternal(d CIDDescriptor, attr string, treeID stri
 			return err
 		}
 
-		i, node := t.getPathPrefix(bTree, attr, path)
+		i, node, err := t.getPathPrefix(bTree, attr, path)
+		if err != nil {
+			return err
+		}
 
 		ts := t.getLatestTimestamp(bLog, d.Position, d.Size)
 		lm = make([]Move, len(path)-i+1)
@@ -977,7 +980,10 @@ func (t *boltForest) TreeGetByPath(ctx context.Context, cid cidSDK.ID, treeID st
 
 		b := treeRoot.Bucket(dataBucket)
 
-		i, curNodes := t.getPathPrefixMultiTraversal(b, attr, path[:len(path)-1])
+		i, curNodes, err := t.getPathPrefixMultiTraversal(b, attr, path[:len(path)-1])
+		if err != nil {
+			return err
+		}
 		if i < len(path)-1 {
 			return nil
 		}
@@ -1354,7 +1360,7 @@ func (t *boltForest) TreeList(ctx context.Context, cid cidSDK.ID) ([]string, err
 		return nil
 	})
 	if err != nil {
-		return nil, metaerr.Wrap(fmt.Errorf("list trees: %w", err))
+		return nil, metaerr.Wrap(fmt.Errorf("could not list trees: %w", err))
 	}
 	success = true
 	return ids, nil
@@ -1498,7 +1504,7 @@ func (t *boltForest) TreeListTrees(ctx context.Context, prm TreeListTreesPrm) (*
 
 			var contID cidSDK.ID
 			if err := contID.Decode(k[:32]); err != nil {
-				return fmt.Errorf("decode container ID: %w", err)
+				return fmt.Errorf("failed to decode containerID: %w", err)
 			}
 			res.Items = append(res.Items, ContainerIDTreeID{
 				CID:    contID,
@@ -1520,7 +1526,7 @@ func (t *boltForest) TreeListTrees(ctx context.Context, prm TreeListTreesPrm) (*
 	return &res, nil
 }
 
-func (t *boltForest) getPathPrefixMultiTraversal(bTree *bbolt.Bucket, attr string, path []string) (int, []Node) {
+func (t *boltForest) getPathPrefixMultiTraversal(bTree *bbolt.Bucket, attr string, path []string) (int, []Node, error) {
 	c := bTree.Cursor()
 
 	var curNodes []Node
@@ -1543,14 +1549,14 @@ func (t *boltForest) getPathPrefixMultiTraversal(bTree *bbolt.Bucket, attr strin
 		}
 
 		if len(nextNodes) == 0 {
-			return i, curNodes
+			return i, curNodes, nil
 		}
 	}
 
-	return len(path), nextNodes
+	return len(path), nextNodes, nil
 }
 
-func (t *boltForest) getPathPrefix(bTree *bbolt.Bucket, attr string, path []string) (int, Node) {
+func (t *boltForest) getPathPrefix(bTree *bbolt.Bucket, attr string, path []string) (int, Node, error) {
 	c := bTree.Cursor()
 
 	var curNode Node
@@ -1570,10 +1576,10 @@ loop:
 			childKey, value = c.Next()
 		}
 
-		return i, curNode
+		return i, curNode, nil
 	}
 
-	return len(path), curNode
+	return len(path), curNode, nil
 }
 
 func (t *boltForest) moveFromBytes(m *Move, data []byte) error {

pkg/local_object_storage/shard/container.go

@@ -36,7 +36,7 @@ func (s *Shard) ContainerSize(prm ContainerSizePrm) (ContainerSizeRes, error) {
 
 	size, err := s.metaBase.ContainerSize(prm.cnr)
 	if err != nil {
-		return ContainerSizeRes{}, fmt.Errorf("get container size: %w", err)
+		return ContainerSizeRes{}, fmt.Errorf("could not get container size: %w", err)
 	}
 
 	return ContainerSizeRes{
@@ -71,7 +71,7 @@ func (s *Shard) ContainerCount(ctx context.Context, prm ContainerCountPrm) (Cont
 
 	counters, err := s.metaBase.ContainerCount(ctx, prm.ContainerID)
 	if err != nil {
-		return ContainerCountRes{}, fmt.Errorf("get container counters: %w", err)
+		return ContainerCountRes{}, fmt.Errorf("could not get container counters: %w", err)
 	}
 
 	return ContainerCountRes{

pkg/local_object_storage/shard/control.go

@@ -38,7 +38,7 @@ func (s *Shard) handleMetabaseFailure(ctx context.Context, stage string, err err
 
 	err = s.SetMode(ctx, mode.DegradedReadOnly)
 	if err != nil {
-		return fmt.Errorf("switch to mode %s", mode.DegradedReadOnly)
+		return fmt.Errorf("could not switch to mode %s", mode.Mode(mode.DegradedReadOnly))
 	}
 	return nil
 }
@@ -72,7 +72,7 @@ func (s *Shard) Open(ctx context.Context) error {
 				for j := i + 1; j < len(components); j++ {
 					if err := components[j].Open(ctx, m); err != nil {
 						// Other components must be opened, fail.
-						return fmt.Errorf("open %T: %w", components[j], err)
+						return fmt.Errorf("could not open %T: %w", components[j], err)
 					}
 				}
 				err = s.handleMetabaseFailure(ctx, "open", err)
@@ -83,7 +83,7 @@ func (s *Shard) Open(ctx context.Context) error {
 				break
 			}
 
-			return fmt.Errorf("open %T: %w", component, err)
+			return fmt.Errorf("could not open %T: %w", component, err)
 		}
 	}
 	return nil
@@ -184,7 +184,7 @@ func (s *Shard) initializeComponents(ctx context.Context, m mode.Mode) error {
 				break
 			}
 
-			return fmt.Errorf("initialize %T: %w", component, err)
+			return fmt.Errorf("could not initialize %T: %w", component, err)
 		}
 	}
 	return nil
@@ -205,7 +205,7 @@ func (s *Shard) refillMetabase(ctx context.Context) error {
 
 	err := s.metaBase.Reset()
 	if err != nil {
-		return fmt.Errorf("reset metabase: %w", err)
+		return fmt.Errorf("could not reset metabase: %w", err)
 	}
 
 	withCount := true
@@ -254,12 +254,12 @@ func (s *Shard) refillMetabase(ctx context.Context) error {
 
 	err = errors.Join(egErr, itErr)
 	if err != nil {
-		return fmt.Errorf("put objects to the meta: %w", err)
+		return fmt.Errorf("could not put objects to the meta: %w", err)
 	}
 
 	err = s.metaBase.SyncCounters()
 	if err != nil {
-		return fmt.Errorf("sync object counters: %w", err)
+		return fmt.Errorf("could not sync object counters: %w", err)
 	}
 
 	success = true
@@ -318,7 +318,7 @@ func (s *Shard) refillObject(ctx context.Context, data []byte, addr oid.Address,
 func (s *Shard) refillLockObject(ctx context.Context, obj *objectSDK.Object) error {
 	var lock objectSDK.Lock
 	if err := lock.Unmarshal(obj.Payload()); err != nil {
-		return fmt.Errorf("unmarshal lock content: %w", err)
+		return fmt.Errorf("could not unmarshal lock content: %w", err)
 	}
 
 	locked := make([]oid.ID, lock.NumberOfMembers())
@@ -328,7 +328,7 @@ func (s *Shard) refillLockObject(ctx context.Context, obj *objectSDK.Object) err
 	id, _ := obj.ID()
 	err := s.metaBase.Lock(ctx, cnr, id, locked)
 	if err != nil {
-		return fmt.Errorf("lock objects: %w", err)
+		return fmt.Errorf("could not lock objects: %w", err)
 	}
 	return nil
 }
@@ -337,7 +337,7 @@ func (s *Shard) refillTombstoneObject(ctx context.Context, obj *objectSDK.Object
 	tombstone := objectSDK.NewTombstone()
 
 	if err := tombstone.Unmarshal(obj.Payload()); err != nil {
-		return fmt.Errorf("unmarshal tombstone content: %w", err)
+		return fmt.Errorf("could not unmarshal tombstone content: %w", err)
 	}
 
 	tombAddr := object.AddressOf(obj)
@@ -358,7 +358,7 @@ func (s *Shard) refillTombstoneObject(ctx context.Context, obj *objectSDK.Object
 
 	_, err := s.metaBase.Inhume(ctx, inhumePrm)
 	if err != nil {
-		return fmt.Errorf("inhume objects: %w", err)
+		return fmt.Errorf("could not inhume objects: %w", err)
 	}
 	return nil
 }

pkg/local_object_storage/shard/get.go

@@ -175,7 +175,7 @@ func (s *Shard) fetchObjectData(ctx context.Context, addr oid.Address, skipMeta
 
 	mExRes, err := s.metaBase.StorageID(ctx, mPrm)
 	if err != nil {
-		return nil, true, fmt.Errorf("fetch blobovnicza id from metabase: %w", err)
+		return nil, true, fmt.Errorf("can't fetch blobovnicza id from metabase: %w", err)
 	}
 
 	storageID := mExRes.StorageID()

pkg/local_object_storage/shard/id.go

@@ -36,7 +36,7 @@ func (s *Shard) UpdateID(ctx context.Context) (err error) {
 	modeDegraded := s.GetMode().NoMetabase()
 	if !modeDegraded {
 		if idFromMetabase, err = s.metaBase.GetShardID(ctx, mode.ReadOnly); err != nil {
-			err = fmt.Errorf("read shard id from metabase: %w", err)
+			err = fmt.Errorf("failed to read shard id from metabase: %w", err)
 		}
 	}
 
@@ -64,7 +64,7 @@ func (s *Shard) UpdateID(ctx context.Context) (err error) {
 
 	if len(idFromMetabase) == 0 && !modeDegraded {
 		if setErr := s.metaBase.SetShardID(ctx, *s.info.ID, s.GetMode()); setErr != nil {
-			err = errors.Join(err, fmt.Errorf("write shard id to metabase: %w", setErr))
+			err = errors.Join(err, fmt.Errorf("failed to write shard id to metabase: %w", setErr))
 		}
 	}
 	return

pkg/local_object_storage/shard/list.go

@@ -109,7 +109,7 @@ func (s *Shard) List(ctx context.Context) (res SelectRes, err error) {
 
 	lst, err := s.metaBase.Containers(ctx)
 	if err != nil {
-		return res, fmt.Errorf("list stored containers: %w", err)
+		return res, fmt.Errorf("can't list stored containers: %w", err)
 	}
 
 	filters := objectSDK.NewSearchFilters()
@@ -149,7 +149,7 @@ func (s *Shard) ListContainers(ctx context.Context, _ ListContainersPrm) (ListCo
 
 	containers, err := s.metaBase.Containers(ctx)
 	if err != nil {
-		return ListContainersRes{}, fmt.Errorf("get list of containers: %w", err)
+		return ListContainersRes{}, fmt.Errorf("could not get list of containers: %w", err)
 	}
 
 	return ListContainersRes{
@@ -180,7 +180,7 @@ func (s *Shard) ListWithCursor(ctx context.Context, prm ListWithCursorPrm) (List
 	metaPrm.SetCursor(prm.cursor)
 	res, err := s.metaBase.ListWithCursor(ctx, metaPrm)
 	if err != nil {
-		return ListWithCursorRes{}, fmt.Errorf("get list of objects: %w", err)
+		return ListWithCursorRes{}, fmt.Errorf("could not get list of objects: %w", err)
 	}
 
 	return ListWithCursorRes{
@@ -208,7 +208,7 @@ func (s *Shard) IterateOverContainers(ctx context.Context, prm IterateOverContai
 	metaPrm.Handler = prm.Handler
 	err := s.metaBase.IterateOverContainers(ctx, metaPrm)
 	if err != nil {
-		return fmt.Errorf("iterate over containers: %w", err)
+		return fmt.Errorf("could not iterate over containers: %w", err)
 	}
 
 	return nil
@@ -235,7 +235,7 @@ func (s *Shard) IterateOverObjectsInContainer(ctx context.Context, prm IterateOv
 	metaPrm.Handler = prm.Handler
 	err := s.metaBase.IterateOverObjectsInContainer(ctx, metaPrm)
 	if err != nil {
-		return fmt.Errorf("iterate over objects: %w", err)
+		return fmt.Errorf("could not iterate over objects: %w", err)
 	}
 
 	return nil
@@ -258,7 +258,7 @@ func (s *Shard) CountAliveObjectsInContainer(ctx context.Context, prm CountAlive
 	metaPrm.ContainerID = prm.ContainerID
 	count, err := s.metaBase.CountAliveObjectsInContainer(ctx, metaPrm)
 	if err != nil {
-		return 0, fmt.Errorf("count alive objects in bucket: %w", err)
+		return 0, fmt.Errorf("could not count alive objects in bucket: %w", err)
 	}
 
 	return count, nil

pkg/local_object_storage/shard/put.go

@@ -81,7 +81,7 @@ func (s *Shard) Put(ctx context.Context, prm PutPrm) (PutRes, error) {
 
 		res, err = s.blobStor.Put(ctx, putPrm)
 		if err != nil {
-			return PutRes{}, fmt.Errorf("put object to BLOB storage: %w", err)
+			return PutRes{}, fmt.Errorf("could not put object to BLOB storage: %w", err)
 		}
 	}
 
@@ -94,7 +94,7 @@ func (s *Shard) Put(ctx context.Context, prm PutPrm) (PutRes, error) {
 		if err != nil {
 			// may we need to handle this case in a special way
 			// since the object has been successfully written to BlobStor
-			return PutRes{}, fmt.Errorf("put object to metabase: %w", err)
+			return PutRes{}, fmt.Errorf("could not put object to metabase: %w", err)
 		}
 
 		if res.Inserted {

pkg/local_object_storage/shard/select.go

@@ -67,7 +67,7 @@ func (s *Shard) Select(ctx context.Context, prm SelectPrm) (SelectRes, error) {
 
 	mRes, err := s.metaBase.Select(ctx, selectPrm)
 	if err != nil {
-		return SelectRes{}, fmt.Errorf("select objects from metabase: %w", err)
+		return SelectRes{}, fmt.Errorf("could not select objects from metabase: %w", err)
 	}
 
 	return SelectRes{

pkg/local_object_storage/writecache/cache.go

@@ -94,8 +94,7 @@ func (c *cache) Open(_ context.Context, mod mode.Mode) error {
 	if err != nil {
 		return metaerr.Wrap(err)
 	}
-	c.initCounters()
-	return nil
+	return metaerr.Wrap(c.initCounters())
 }
 
 // Init runs necessary services.

pkg/local_object_storage/writecache/iterate.go

@@ -30,7 +30,7 @@ func IterateDB(db *bbolt.DB, f func(oid.Address) error) error {
 		return b.ForEach(func(k, _ []byte) error {
 			err := addr.DecodeString(string(k))
 			if err != nil {
-				return fmt.Errorf("parse object address: %w", err)
+				return fmt.Errorf("could not parse object address: %w", err)
 			}
 
 			return f(addr)

pkg/local_object_storage/writecache/mode.go

@@ -83,7 +83,7 @@ func (c *cache) closeStorage(ctx context.Context, shrink bool) error {
 	}
 	if !shrink {
 		if err := c.fsTree.Close(ctx); err != nil {
-			return fmt.Errorf("close write-cache storage: %w", err)
+			return fmt.Errorf("can't close write-cache storage: %w", err)
 		}
 		return nil
 	}
@@ -98,16 +98,16 @@ func (c *cache) closeStorage(ctx context.Context, shrink bool) error {
 		if errors.Is(err, errIterationCompleted) {
 			empty = false
 		} else {
-			return fmt.Errorf("check write-cache items: %w", err)
+			return fmt.Errorf("failed to check write-cache items: %w", err)
 		}
 	}
 	if err := c.fsTree.Close(ctx); err != nil {
-		return fmt.Errorf("close write-cache storage: %w", err)
+		return fmt.Errorf("can't close write-cache storage: %w", err)
 	}
 	if empty {
 		err := os.RemoveAll(c.path)
 		if err != nil && !os.IsNotExist(err) {
-			return fmt.Errorf("remove write-cache files: %w", err)
+			return fmt.Errorf("failed to remove write-cache files: %w", err)
 		}
 	} else {
 		c.log.Info(ctx, logs.WritecacheShrinkSkippedNotEmpty)

pkg/local_object_storage/writecache/state.go

@@ -19,6 +19,7 @@ func (c *cache) hasEnoughSpace(objectSize uint64) bool {
 	return c.maxCacheSize >= size+objectSize
 }
 
-func (c *cache) initCounters() {
+func (c *cache) initCounters() error {
 	c.estimateCacheSize()
+	return nil
 }

pkg/local_object_storage/writecache/storage.go

@@ -31,10 +31,10 @@ func (c *cache) openStore(mod mode.ComponentMode) error {
 		fstree.WithFileCounter(c.counter),
 	)
 	if err := c.fsTree.Open(mod); err != nil {
-		return fmt.Errorf("open FSTree: %w", err)
+		return fmt.Errorf("could not open FSTree: %w", err)
 	}
 	if err := c.fsTree.Init(); err != nil {
-		return fmt.Errorf("init FSTree: %w", err)
+		return fmt.Errorf("could not init FSTree: %w", err)
 	}
 
 	return nil

pkg/local_object_storage/writecache/upgrade.go

@@ -25,11 +25,11 @@ func (c *cache) flushAndDropBBoltDB(ctx context.Context) error {
 		return nil
 	}
 	if err != nil {
-		return fmt.Errorf("check write-cache database existence: %w", err)
+		return fmt.Errorf("could not check write-cache database existence: %w", err)
 	}
 	db, err := OpenDB(c.path, true, os.OpenFile)
 	if err != nil {
-		return fmt.Errorf("open write-cache database: %w", err)
+		return fmt.Errorf("could not open write-cache database: %w", err)
 	}
 	defer func() {
 		_ = db.Close()

pkg/morph/client/client.go

@@ -210,7 +210,7 @@ func (c *Client) Invoke(ctx context.Context, contract util.Uint160, fee fixedn.F
 
 // TestInvokeIterator invokes contract method returning an iterator and executes cb on each element.
 // If cb returns an error, the session is closed and this error is returned as-is.
-// If the remote neo-go node does not support sessions, `unwrap.ErrNoSessionID` is returned.
+// If the remove neo-go node does not support sessions, `unwrap.ErrNoSessionID` is returned.
 // batchSize is the number of items to prefetch: if the number of items in the iterator is less than batchSize, no session will be created.
 // The default batchSize is 100, the default limit from neo-go.
 func (c *Client) TestInvokeIterator(cb func(stackitem.Item) error, batchSize int, contract util.Uint160, method string, args ...interface{}) error {

pkg/morph/client/container/containers_of.go

@@ -2,7 +2,9 @@ package container
 
 import (
 	"errors"
+	"fmt"
 
+	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client"
 	cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id"
 	"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/user"
 	"github.com/nspcc-dev/neo-go/pkg/rpcclient/unwrap"
@@ -14,36 +16,27 @@ import (
 //
 // If remote RPC does not support neo-go session API, fallback to List() method.
 func (c *Client) ContainersOf(idUser *user.ID) ([]cid.ID, error) {
-	var cidList []cid.ID
-	var err error
-
-	cb := func(id cid.ID) error {
-		cidList = append(cidList, id)
-		return nil
-	}
-	if err = c.IterateContainersOf(idUser, cb); err != nil {
-		return nil, err
-	}
-	return cidList, nil
-}
-
-// iterateContainers iterates over a list of container identifiers
-// belonging to the specified user of FrostFS system and executes
-// `cb` on each element. If idUser is nil, calls it on the list of all containers.
-func (c *Client) IterateContainersOf(idUser *user.ID, cb func(item cid.ID) error) error {
 	var rawID []byte
+
 	if idUser != nil {
 		rawID = idUser.WalletBytes()
 	}
 
-	itemCb := func(item stackitem.Item) error {
-		id, err := getCIDfromStackItem(item)
+	var cidList []cid.ID
+	cb := func(item stackitem.Item) error {
+		rawID, err := client.BytesFromStackItem(item)
 		if err != nil {
-			return err
+			return fmt.Errorf("get byte array from stack item (%s): %w", containersOfMethod, err)
 		}
-		if err = cb(id); err != nil {
-			return err
+
+		var id cid.ID
+
+		err = id.Decode(rawID)
+		if err != nil {
+			return fmt.Errorf("decode container ID: %w", err)
 		}
+
+		cidList = append(cidList, id)
 		return nil
 	}
 
@@ -57,10 +50,13 @@ func (c *Client) IterateContainersOf(idUser *user.ID, cb func(item cid.ID) error
 	const batchSize = 512
 
 	cnrHash := c.client.ContractAddress()
-	err := c.client.Morph().TestInvokeIterator(itemCb, batchSize, cnrHash, containersOfMethod, rawID)
-	if err != nil && errors.Is(err, unwrap.ErrNoSessionID) {
-		return c.iterate(idUser, cb)
+	err := c.client.Morph().TestInvokeIterator(cb, batchSize, cnrHash, containersOfMethod, rawID)
+	if err != nil {
+		if errors.Is(err, unwrap.ErrNoSessionID) {
+			return c.list(idUser)
+		}
+		return nil, err
 	}
 
-	return err
+	return cidList, nil
 }