cmd/frostfs-adm/internal/modules/metabase/upgrade.go

@@ -135,7 +135,7 @@ func createContainerInfoProvider(cli *client.Client) (container.InfoProvider, er
 	if err != nil {
 		return nil, fmt.Errorf("resolve container contract hash: %w", err)
 	}
-	cc, err := morphcontainer.NewFromMorph(cli, sh, 0, morphcontainer.TryNotary())
+	cc, err := morphcontainer.NewFromMorph(cli, sh, 0)
 	if err != nil {
 		return nil, fmt.Errorf("create morph container client: %w", err)
 	}

cmd/frostfs-node/config.go

@@ -591,8 +591,6 @@ type cfgMorph struct {
 
 	client *client.Client
 
-	notaryEnabled bool
-
 	// TTL of Sidechain cached values. Non-positive value disables caching.
 	cacheTTL time.Duration
 
@@ -1466,7 +1464,7 @@ func (c *cfg) createTombstoneSource() *tombstone.ExpirationChecker {
 func (c *cfg) createContainerInfoProvider(ctx context.Context) container.InfoProvider {
 	return container.NewInfoProvider(func() (container.Source, error) {
 		c.initMorphComponents(ctx)
-		cc, err := containerClient.NewFromMorph(c.cfgMorph.client, c.cfgContainer.scriptHash, 0, containerClient.TryNotary())
+		cc, err := containerClient.NewFromMorph(c.cfgMorph.client, c.cfgContainer.scriptHash, 0)
 		if err != nil {
 			return nil, err
 		}

cmd/frostfs-node/container.go

@@ -28,7 +28,7 @@ import (
 func initContainerService(_ context.Context, c *cfg) {
 	// container wrapper that tries to invoke notary
 	// requests if chain is configured so
-	wrap, err := cntClient.NewFromMorph(c.cfgMorph.client, c.cfgContainer.scriptHash, 0, cntClient.TryNotary())
+	wrap, err := cntClient.NewFromMorph(c.cfgMorph.client, c.cfgContainer.scriptHash, 0)
 	fatalOnErr(err)
 
 	c.shared.cnrClient = wrap

cmd/frostfs-node/morph.go

@@ -35,20 +35,16 @@ func (c *cfg) initMorphComponents(ctx context.Context) {
 
 	lookupScriptHashesInNNS(c) // smart contract auto negotiation
 
-	if c.cfgMorph.notaryEnabled {
 	err := c.cfgMorph.client.EnableNotarySupport(
 		client.WithProxyContract(
 			c.cfgMorph.proxyScriptHash,
 		),
 	)
 	fatalOnErr(err)
-	}
 
-	c.log.Info(ctx, logs.FrostFSNodeNotarySupport,
+	c.log.Info(ctx, logs.FrostFSNodeNotarySupport)
-		zap.Bool("sidechain_enabled", c.cfgMorph.notaryEnabled),
-	)
 
-	wrap, err := nmClient.NewFromMorph(c.cfgMorph.client, c.cfgNetmap.scriptHash, 0, nmClient.TryNotary())
+	wrap, err := nmClient.NewFromMorph(c.cfgMorph.client, c.cfgNetmap.scriptHash, 0)
 	fatalOnErr(err)
 
 	var netmapSource netmap.Source
@@ -116,15 +112,9 @@ func initMorphClient(ctx context.Context, c *cfg) {
 	}
 
 	c.cfgMorph.client = cli
-	c.cfgMorph.notaryEnabled = cli.ProbeNotary()
 }
 
 func makeAndWaitNotaryDeposit(ctx context.Context, c *cfg) {
-	// skip notary deposit in non-notary environments
-	if !c.cfgMorph.notaryEnabled {
-		return
-	}
-
 	tx, vub, err := makeNotaryDeposit(ctx, c)
 	fatalOnErr(err)
 
@@ -282,10 +272,6 @@ func lookupScriptHashesInNNS(c *cfg) {
 	)
 
 	for _, t := range targets {
-		if t.nnsName == client.NNSProxyContractName && !c.cfgMorph.notaryEnabled {
-			continue // ignore proxy contract if notary disabled
-		}
-
 		if emptyHash.Equals(*t.h) {
 			*t.h, err = c.cfgMorph.client.NNSContractAddress(t.nnsName)
 			fatalOnErrDetails(fmt.Sprintf("can't resolve %s in NNS", t.nnsName), err)

cmd/frostfs-node/netmap.go

@@ -193,7 +193,6 @@ func addNewEpochNotificationHandlers(c *cfg) {
 		}
 	})
 
-	if c.cfgMorph.notaryEnabled {
 	addNewEpochAsyncNotificationHandler(c, func(ctx context.Context, _ event.Event) {
 		_, _, err := makeNotaryDeposit(ctx, c)
 		if err != nil {
@@ -203,7 +202,6 @@ func addNewEpochNotificationHandlers(c *cfg) {
 		}
 	})
 }
-}
 
 // bootstrapNode adds current node to the Network map.
 // Must be called after initNetmapService.

cmd/frostfs-node/object.go

@@ -13,7 +13,6 @@ import (
 	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/netmap"
 	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/engine"
 	morphClient "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client"
-	nmClient "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client/netmap"
 	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/network/cache"
 	objectTransportGRPC "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/network/transport/object/grpc"
 	objectService "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/object"
@@ -137,24 +136,6 @@ func (fn *innerRingFetcherWithNotary) InnerRingKeys() ([][]byte, error) {
 	return result, nil
 }
 
-type innerRingFetcherWithoutNotary struct {
-	nm *nmClient.Client
-}
-
-func (f *innerRingFetcherWithoutNotary) InnerRingKeys() ([][]byte, error) {
-	keys, err := f.nm.GetInnerRingList()
-	if err != nil {
-		return nil, fmt.Errorf("can't get inner ring keys from netmap contract: %w", err)
-	}
-
-	result := make([][]byte, 0, len(keys))
-	for i := range keys {
-		result = append(result, keys[i].Bytes())
-	}
-
-	return result, nil
-}
-
 func initObjectService(c *cfg) {
 	keyStorage := util.NewKeyStorage(&c.key.PrivateKey, c.privateTokenStore, c.cfgNetmap.state)
 
@@ -305,15 +286,10 @@ func addPolicer(c *cfg, keyStorage *util.KeyStorage, clientConstructor *cache.Cl
 }
 
 func createInnerRingFetcher(c *cfg) v2.InnerRingFetcher {
-	if c.cfgMorph.client.ProbeNotary() {
 	return &innerRingFetcherWithNotary{
 		sidechain: c.cfgMorph.client,
 	}
 }
-	return &innerRingFetcherWithoutNotary{
-		nm: c.cfgNetmap.wrapper,
-	}
-}
 
 func createReplicator(c *cfg, keyStorage *util.KeyStorage, cache *cache.ClientCache) *replicator.Replicator {
 	ls := c.cfgObject.cfgLocalStorage.localStorage

pkg/innerring/initialization.go

@@ -380,7 +380,6 @@ func (s *Server) initClientsFromMorph() (*serverMorphClients, error) {
 	// form morph container client's options
 	morphCnrOpts := make([]container.Option, 0, 3)
 	morphCnrOpts = append(morphCnrOpts,
-		container.TryNotary(),
 		container.AsAlphabet(),
 	)
 
@@ -390,12 +389,12 @@ func (s *Server) initClientsFromMorph() (*serverMorphClients, error) {
 	}
 	s.containerClient = result.CnrClient
 
-	s.netmapClient, err = nmClient.NewFromMorph(s.morphClient, s.contracts.netmap, fee, nmClient.TryNotary(), nmClient.AsAlphabet())
+	s.netmapClient, err = nmClient.NewFromMorph(s.morphClient, s.contracts.netmap, fee, nmClient.AsAlphabet())
 	if err != nil {
 		return nil, err
 	}
 
-	s.balanceClient, err = balanceClient.NewFromMorph(s.morphClient, s.contracts.balance, fee, balanceClient.TryNotary(), balanceClient.AsAlphabet())
+	s.balanceClient, err = balanceClient.NewFromMorph(s.morphClient, s.contracts.balance, fee, balanceClient.AsAlphabet())
 	if err != nil {
 		return nil, err
 	}

pkg/morph/client/balance/client.go

@@ -54,15 +54,7 @@ type Option func(*opts)
 type opts []client.StaticClientOption
 
 func defaultOpts() *opts {
-	return new(opts)
+	return &opts{client.TryNotary()}
-}
-
-// TryNotary returns option to enable
-// notary invocation tries.
-func TryNotary() Option {
-	return func(o *opts) {
-		*o = append(*o, client.TryNotary())
-	}
 }
 
 // AsAlphabet returns option to sign main TX

pkg/morph/client/balance/transfer.go

@@ -21,8 +21,6 @@ type TransferPrm struct {
 
 // TransferX transfers p.Amount of GASe-12 from p.From to p.To
 // with details p.Details through direct smart contract call.
-//
-// If TryNotary is provided, calls notary contract.
 func (c *Client) TransferX(ctx context.Context, p TransferPrm) error {
 	from, err := p.From.ScriptHash()
 	if err != nil {

pkg/morph/client/container/client.go

@@ -46,7 +46,7 @@ func NewFromMorph(cli *client.Client, contract util.Uint160, fee fixedn.Fixed8,
 		opts[i](o)
 	}
 
-	sc, err := client.NewStatic(cli, contract, fee, o.staticOpts...)
+	sc, err := client.NewStatic(cli, contract, fee, *o...)
 	if err != nil {
 		return nil, fmt.Errorf("create 'container' contract client: %w", err)
 	}
@@ -68,20 +68,10 @@ func (c Client) ContractAddress() util.Uint160 {
 // parameter of Wrapper.
 type Option func(*opts)
 
-type opts struct {
+type opts []client.StaticClientOption
-	staticOpts []client.StaticClientOption
-}
 
 func defaultOpts() *opts {
-	return new(opts)
+	return &opts{client.TryNotary()}
-}
-
-// TryNotary returns option to enable
-// notary invocation tries.
-func TryNotary() Option {
-	return func(o *opts) {
-		o.staticOpts = append(o.staticOpts, client.TryNotary())
-	}
 }
 
 // AsAlphabet returns option to sign main TX
@@ -91,6 +81,6 @@ func TryNotary() Option {
 // Considered to be used by IR nodes only.
 func AsAlphabet() Option {
 	return func(o *opts) {
-		o.staticOpts = append(o.staticOpts, client.AsAlphabet())
+		*o = append(*o, client.AsAlphabet())
 	}
 }

pkg/morph/client/container/delete.go

@@ -66,8 +66,6 @@ func (d *DeletePrm) SetKey(key []byte) {
 //
 // Returns valid until block and any error encountered that caused
 // the removal to interrupt.
-//
-// If TryNotary is provided, calls notary contract.
 func (c *Client) Delete(ctx context.Context, p DeletePrm) (uint32, error) {
 	if len(p.signature) == 0 && !p.IsControl() {
 		return 0, errNilArgument

pkg/morph/client/container/put.go

@@ -94,8 +94,6 @@ func (p *PutPrm) SetZone(zone string) {
 //
 // Returns calculated container identifier and any error
 // encountered that caused the saving to interrupt.
-//
-// If TryNotary is provided, calls notary contract.
 func (c *Client) Put(ctx context.Context, p PutPrm) error {
 	if len(p.sig) == 0 || len(p.key) == 0 {
 		return errNilArgument

pkg/morph/client/netmap/client.go

@@ -65,15 +65,7 @@ type Option func(*opts)
 type opts []client.StaticClientOption
 
 func defaultOpts() *opts {
-	return new(opts)
+	return &opts{client.TryNotary()}
-}
-
-// TryNotary returns option to enable
-// notary invocation tries.
-func TryNotary() Option {
-	return func(o *opts) {
-		*o = append(*o, client.TryNotary())
-	}
 }
 
 // AsAlphabet returns option to sign main TX