diff --git a/cmd/neofs-cli/modules/netmap.go b/cmd/neofs-cli/modules/netmap.go index a2c32e3262..056394ca42 100644 --- a/cmd/neofs-cli/modules/netmap.go +++ b/cmd/neofs-cli/modules/netmap.go @@ -7,7 +7,7 @@ import ( "github.com/mr-tron/base58" "github.com/nspcc-dev/neo-go/pkg/config/netmode" internalclient "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/client" - "github.com/nspcc-dev/neofs-node/pkg/morph/client/netmap/wrapper" + nmClient "github.com/nspcc-dev/neofs-node/pkg/morph/client/netmap" "github.com/nspcc-dev/neofs-node/pkg/services/control" "github.com/nspcc-dev/neofs-sdk-go/netmap" "github.com/spf13/cobra" @@ -171,7 +171,7 @@ var netInfoCmd = &cobra.Command{ cmd.Println("NeoFS network configuration") - err = wrapper.WriteConfig((*netCfgWriter)(cmd), func(f func(key []byte, val []byte) error) error { + err = nmClient.WriteConfig((*netCfgWriter)(cmd), func(f func(key []byte, val []byte) error) error { var err error netCfg.IterateParameters(func(prm *netmap.NetworkParameter) bool { diff --git a/cmd/neofs-node/config.go b/cmd/neofs-node/config.go index c95ed37522..5ba45cf86f 100644 --- a/cmd/neofs-node/config.go +++ b/cmd/neofs-node/config.go @@ -28,7 +28,7 @@ import ( "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/writecache" "github.com/nspcc-dev/neofs-node/pkg/metrics" "github.com/nspcc-dev/neofs-node/pkg/morph/client" - nmwrapper "github.com/nspcc-dev/neofs-node/pkg/morph/client/netmap/wrapper" + nmClient "github.com/nspcc-dev/neofs-node/pkg/morph/client/netmap" "github.com/nspcc-dev/neofs-node/pkg/morph/event" netmap2 "github.com/nspcc-dev/neofs-node/pkg/morph/event/netmap" "github.com/nspcc-dev/neofs-node/pkg/morph/timer" @@ -155,7 +155,7 @@ type cfgContainer struct { type cfgNetmap struct { scriptHash neogoutil.Uint160 - wrapper *nmwrapper.Wrapper + wrapper *nmClient.Client parsers map[event.Type]event.NotificationParser @@ -478,7 +478,7 @@ func (c *cfg) bootstrap() error { ni := c.cfgNodeInfo.localInfo ni.SetState(netmap.NodeStateOnline) - prm := nmwrapper.AddPeerPrm{} + prm := nmClient.AddPeerPrm{} prm.SetNodeInfo(&ni) return c.cfgNetmap.wrapper.AddPeer(prm) diff --git a/cmd/neofs-node/morph.go b/cmd/neofs-node/morph.go index 136df420d9..810e150170 100644 --- a/cmd/neofs-node/morph.go +++ b/cmd/neofs-node/morph.go @@ -11,7 +11,7 @@ import ( morphconfig "github.com/nspcc-dev/neofs-node/cmd/neofs-node/config/morph" "github.com/nspcc-dev/neofs-node/pkg/core/netmap" "github.com/nspcc-dev/neofs-node/pkg/morph/client" - "github.com/nspcc-dev/neofs-node/pkg/morph/client/netmap/wrapper" + nmClient "github.com/nspcc-dev/neofs-node/pkg/morph/client/netmap" "github.com/nspcc-dev/neofs-node/pkg/morph/event" netmapEvent "github.com/nspcc-dev/neofs-node/pkg/morph/event/netmap" "github.com/nspcc-dev/neofs-node/pkg/morph/subscriber" @@ -85,7 +85,7 @@ func initMorphComponents(c *cfg) { ) }) - wrap, err := wrapper.NewFromMorph(c.cfgMorph.client, c.cfgNetmap.scriptHash, 0, wrapper.TryNotary()) + wrap, err := nmClient.NewFromMorph(c.cfgMorph.client, c.cfgNetmap.scriptHash, 0, nmClient.TryNotary()) fatalOnErr(err) var netmapSource netmap.Source diff --git a/cmd/neofs-node/netmap.go b/cmd/neofs-node/netmap.go index 948e63f0e9..a827753e83 100644 --- a/cmd/neofs-node/netmap.go +++ b/cmd/neofs-node/netmap.go @@ -11,7 +11,7 @@ import ( nodeconfig "github.com/nspcc-dev/neofs-node/cmd/neofs-node/config/node" "github.com/nspcc-dev/neofs-node/pkg/core/netmap" "github.com/nspcc-dev/neofs-node/pkg/metrics" - "github.com/nspcc-dev/neofs-node/pkg/morph/client/netmap/wrapper" + nmClient "github.com/nspcc-dev/neofs-node/pkg/morph/client/netmap" "github.com/nspcc-dev/neofs-node/pkg/morph/event" netmapEvent "github.com/nspcc-dev/neofs-node/pkg/morph/event/netmap" "github.com/nspcc-dev/neofs-node/pkg/network" @@ -317,7 +317,7 @@ func (c *cfg) SetNetmapStatus(st control.NetmapStatus) error { c.cfgNetmap.reBoostrapTurnedOff.Store(true) - prm := wrapper.UpdatePeerPrm{} + prm := nmClient.UpdatePeerPrm{} prm.SetKey(c.key.PublicKey().Bytes()) prm.SetState(apiState) diff --git a/cmd/neofs-node/object.go b/cmd/neofs-node/object.go index b11517c3b2..dbd4487eb7 100644 --- a/cmd/neofs-node/object.go +++ b/cmd/neofs-node/object.go @@ -15,7 +15,7 @@ import ( "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/engine" morphClient "github.com/nspcc-dev/neofs-node/pkg/morph/client" cntrwrp "github.com/nspcc-dev/neofs-node/pkg/morph/client/container/wrapper" - nmwrp "github.com/nspcc-dev/neofs-node/pkg/morph/client/netmap/wrapper" + nmClient "github.com/nspcc-dev/neofs-node/pkg/morph/client/netmap" objectTransportGRPC "github.com/nspcc-dev/neofs-node/pkg/network/transport/object/grpc" objectService "github.com/nspcc-dev/neofs-node/pkg/services/object" "github.com/nspcc-dev/neofs-node/pkg/services/object/acl" @@ -151,7 +151,7 @@ func (fn *innerRingFetcherWithNotary) InnerRingKeys() ([][]byte, error) { } type innerRingFetcherWithoutNotary struct { - nm *nmwrp.Wrapper + nm *nmClient.Client } func (f *innerRingFetcherWithoutNotary) InnerRingKeys() ([][]byte, error) { diff --git a/cmd/neofs-node/timers.go b/cmd/neofs-node/timers.go index 692337aa64..8ab82bee77 100644 --- a/cmd/neofs-node/timers.go +++ b/cmd/neofs-node/timers.go @@ -3,7 +3,7 @@ package main import ( "sync" - wrapNetmap "github.com/nspcc-dev/neofs-node/pkg/morph/client/netmap/wrapper" + nmClient "github.com/nspcc-dev/neofs-node/pkg/morph/client/netmap" "github.com/nspcc-dev/neofs-node/pkg/morph/timer" ) @@ -13,13 +13,13 @@ type ( EigenTrustDuration struct { sync.Mutex - nm *wrapNetmap.Wrapper + nm *nmClient.Client val uint32 } ) // NewEigenTrustDuration returns instance of EigenTrustDuration. -func NewEigenTrustDuration(nm *wrapNetmap.Wrapper) *EigenTrustDuration { +func NewEigenTrustDuration(nm *nmClient.Client) *EigenTrustDuration { return &EigenTrustDuration{ nm: nm, } diff --git a/pkg/innerring/config/config.go b/pkg/innerring/config/config.go index 4ece4fa95e..0c22478695 100644 --- a/pkg/innerring/config/config.go +++ b/pkg/innerring/config/config.go @@ -14,16 +14,16 @@ Implemented as a part of https://github.com/nspcc-dev/neofs-node/issues/363 import ( "github.com/nspcc-dev/neofs-node/misc" - netmapClient "github.com/nspcc-dev/neofs-node/pkg/morph/client/netmap/wrapper" + netmapClient "github.com/nspcc-dev/neofs-node/pkg/morph/client/netmap" "github.com/spf13/viper" ) type GlobalConfig struct { cfg *viper.Viper - nm *netmapClient.Wrapper + nm *netmapClient.Client } -func NewGlobalConfigReader(cfg *viper.Viper, nm *netmapClient.Wrapper) *GlobalConfig { +func NewGlobalConfigReader(cfg *viper.Viper, nm *netmapClient.Client) *GlobalConfig { return &GlobalConfig{ cfg: cfg, nm: nm, diff --git a/pkg/innerring/fetcher.go b/pkg/innerring/fetcher.go index 3d2fc6af3e..b6c9cbe15e 100644 --- a/pkg/innerring/fetcher.go +++ b/pkg/innerring/fetcher.go @@ -3,7 +3,7 @@ package innerring import ( "github.com/nspcc-dev/neo-go/pkg/crypto/keys" "github.com/nspcc-dev/neofs-node/pkg/morph/client" - nmWrapper "github.com/nspcc-dev/neofs-node/pkg/morph/client/netmap/wrapper" + nmClient "github.com/nspcc-dev/neofs-node/pkg/morph/client/netmap" ) // NewIRFetcherWithNotary creates IrFetcherWithNotary. @@ -26,7 +26,7 @@ func NewIRFetcherWithNotary(cli *client.Client) *IrFetcherWithNotary { // contract. // // Passed netmap wrapper is required. Panics if nil. -func NewIRFetcherWithoutNotary(nm *nmWrapper.Wrapper) *IrFetcherWithoutNotary { +func NewIRFetcherWithoutNotary(nm *nmClient.Client) *IrFetcherWithoutNotary { if nm == nil { panic("could not init IRFetcher without notary: netmap wrapper must not be nil") } @@ -42,7 +42,7 @@ type IrFetcherWithNotary struct { // IrFetcherWithoutNotary fetches keys using netmap contract. Must be created // with NewIRFetcherWithoutNotary. type IrFetcherWithoutNotary struct { - nm *nmWrapper.Wrapper + nm *nmClient.Client } // InnerRingKeys fetches list of innerring keys from NeoFSAlphabet diff --git a/pkg/innerring/innerring.go b/pkg/innerring/innerring.go index 3b2e689ce3..122c6ba0dd 100644 --- a/pkg/innerring/innerring.go +++ b/pkg/innerring/innerring.go @@ -34,7 +34,7 @@ import ( cntWrapper "github.com/nspcc-dev/neofs-node/pkg/morph/client/container/wrapper" neofsClient "github.com/nspcc-dev/neofs-node/pkg/morph/client/neofs" "github.com/nspcc-dev/neofs-node/pkg/morph/client/neofsid" - nmWrapper "github.com/nspcc-dev/neofs-node/pkg/morph/client/netmap/wrapper" + nmClient "github.com/nspcc-dev/neofs-node/pkg/morph/client/netmap" repWrapper "github.com/nspcc-dev/neofs-node/pkg/morph/client/reputation/wrapper" morphsubnet "github.com/nspcc-dev/neofs-node/pkg/morph/client/subnet" "github.com/nspcc-dev/neofs-node/pkg/morph/event" @@ -77,7 +77,7 @@ type ( auditClient *auditWrapper.ClientWrapper healthStatus atomic.Value balanceClient *balanceClient.Client - netmapClient *nmWrapper.Wrapper + netmapClient *nmClient.Client persistate *state.PersistentStorage // metrics @@ -488,7 +488,7 @@ func New(ctx context.Context, log *zap.Logger, cfg *viper.Viper) (*Server, error return nil, err } - server.netmapClient, err = nmWrapper.NewFromMorph(server.morphClient, server.contracts.netmap, fee, nmWrapper.TryNotary(), nmWrapper.AsAlphabet()) + server.netmapClient, err = nmClient.NewFromMorph(server.morphClient, server.contracts.netmap, fee, nmClient.TryNotary(), nmClient.AsAlphabet()) if err != nil { return nil, err } diff --git a/pkg/innerring/processors/alphabet/processor.go b/pkg/innerring/processors/alphabet/processor.go index 629db57a98..376fbba289 100644 --- a/pkg/innerring/processors/alphabet/processor.go +++ b/pkg/innerring/processors/alphabet/processor.go @@ -6,7 +6,7 @@ import ( "github.com/nspcc-dev/neo-go/pkg/util" "github.com/nspcc-dev/neofs-node/pkg/morph/client" - nmWrapper "github.com/nspcc-dev/neofs-node/pkg/morph/client/netmap/wrapper" + nmClient "github.com/nspcc-dev/neofs-node/pkg/morph/client/netmap" "github.com/nspcc-dev/neofs-node/pkg/morph/event" "github.com/panjf2000/ants/v2" "go.uber.org/zap" @@ -35,7 +35,7 @@ type ( log *zap.Logger pool *ants.Pool alphabetContracts Contracts - netmapClient *nmWrapper.Wrapper + netmapClient *nmClient.Client morphClient *client.Client irList Indexer storageEmission uint64 @@ -46,7 +46,7 @@ type ( Log *zap.Logger PoolSize int AlphabetContracts Contracts - NetmapClient *nmWrapper.Wrapper + NetmapClient *nmClient.Client MorphClient *client.Client IRList Indexer StorageEmission uint64 diff --git a/pkg/innerring/processors/audit/processor.go b/pkg/innerring/processors/audit/processor.go index 31261eda2d..0561791b1a 100644 --- a/pkg/innerring/processors/audit/processor.go +++ b/pkg/innerring/processors/audit/processor.go @@ -9,7 +9,7 @@ import ( "github.com/nspcc-dev/neofs-node/pkg/core/client" wrapContainer "github.com/nspcc-dev/neofs-node/pkg/morph/client/container/wrapper" - wrapNetmap "github.com/nspcc-dev/neofs-node/pkg/morph/client/netmap/wrapper" + nmClient "github.com/nspcc-dev/neofs-node/pkg/morph/client/netmap" "github.com/nspcc-dev/neofs-node/pkg/morph/event" "github.com/nspcc-dev/neofs-node/pkg/services/audit" cid "github.com/nspcc-dev/neofs-sdk-go/container/id" @@ -42,7 +42,7 @@ type ( searchTimeout time.Duration containerClient *wrapContainer.Wrapper - netmapClient *wrapNetmap.Wrapper + netmapClient *nmClient.Client taskManager TaskManager reporter audit.Reporter @@ -52,7 +52,7 @@ type ( // Params of the processor constructor. Params struct { Log *zap.Logger - NetmapClient *wrapNetmap.Wrapper + NetmapClient *nmClient.Client ContainerClient *wrapContainer.Wrapper IRList Indexer SGSource SGSource diff --git a/pkg/innerring/processors/governance/process_update.go b/pkg/innerring/processors/governance/process_update.go index 1b648fbd46..e3fce3f106 100644 --- a/pkg/innerring/processors/governance/process_update.go +++ b/pkg/innerring/processors/governance/process_update.go @@ -10,7 +10,7 @@ import ( "github.com/nspcc-dev/neo-go/pkg/util" "github.com/nspcc-dev/neofs-node/pkg/morph/client" neofscontract "github.com/nspcc-dev/neofs-node/pkg/morph/client/neofs" - "github.com/nspcc-dev/neofs-node/pkg/morph/client/netmap/wrapper" + nmClient "github.com/nspcc-dev/neofs-node/pkg/morph/client/netmap" "go.uber.org/zap" ) @@ -86,7 +86,7 @@ func (gp *Processor) processAlphabetSync(txHash util.Uint256) { ) if gp.notaryDisabled { - updPrm := wrapper.UpdateIRPrm{} + updPrm := nmClient.UpdateIRPrm{} updPrm.SetKeys(newInnerRing) updPrm.SetHash(txHash) diff --git a/pkg/innerring/processors/governance/processor.go b/pkg/innerring/processors/governance/processor.go index c23e51de64..f61686e811 100644 --- a/pkg/innerring/processors/governance/processor.go +++ b/pkg/innerring/processors/governance/processor.go @@ -9,7 +9,7 @@ import ( "github.com/nspcc-dev/neo-go/pkg/util" "github.com/nspcc-dev/neofs-node/pkg/morph/client" neofscontract "github.com/nspcc-dev/neofs-node/pkg/morph/client/neofs" - nmWrapper "github.com/nspcc-dev/neofs-node/pkg/morph/client/netmap/wrapper" + nmClient "github.com/nspcc-dev/neofs-node/pkg/morph/client/netmap" "github.com/nspcc-dev/neofs-node/pkg/morph/event" "github.com/nspcc-dev/neofs-node/pkg/morph/event/rolemanagement" "github.com/panjf2000/ants/v2" @@ -58,7 +58,7 @@ type ( log *zap.Logger pool *ants.Pool neofsClient *neofscontract.Client - netmapClient *nmWrapper.Wrapper + netmapClient *nmClient.Client alphabetState AlphabetState epochState EpochState @@ -85,7 +85,7 @@ type ( MorphClient *client.Client MainnetClient *client.Client NeoFSClient *neofscontract.Client - NetmapClient *nmWrapper.Wrapper + NetmapClient *nmClient.Client NotaryDisabled bool } diff --git a/pkg/innerring/processors/neofs/process_config.go b/pkg/innerring/processors/neofs/process_config.go index ddfddd3cbd..d39fb85899 100644 --- a/pkg/innerring/processors/neofs/process_config.go +++ b/pkg/innerring/processors/neofs/process_config.go @@ -1,7 +1,7 @@ package neofs import ( - "github.com/nspcc-dev/neofs-node/pkg/morph/client/netmap/wrapper" + nmClient "github.com/nspcc-dev/neofs-node/pkg/morph/client/netmap" neofsEvent "github.com/nspcc-dev/neofs-node/pkg/morph/event/neofs" "go.uber.org/zap" ) @@ -14,7 +14,7 @@ func (np *Processor) processConfig(config *neofsEvent.Config) { return } - prm := wrapper.SetConfigPrm{} + prm := nmClient.SetConfigPrm{} prm.SetID(config.ID()) prm.SetKey(config.Key()) diff --git a/pkg/innerring/processors/neofs/processor.go b/pkg/innerring/processors/neofs/processor.go index c774475371..f8e1613b7f 100644 --- a/pkg/innerring/processors/neofs/processor.go +++ b/pkg/innerring/processors/neofs/processor.go @@ -11,7 +11,7 @@ import ( "github.com/nspcc-dev/neofs-node/pkg/morph/client" "github.com/nspcc-dev/neofs-node/pkg/morph/client/balance" "github.com/nspcc-dev/neofs-node/pkg/morph/client/neofsid" - nmWrapper "github.com/nspcc-dev/neofs-node/pkg/morph/client/netmap/wrapper" + nmClient "github.com/nspcc-dev/neofs-node/pkg/morph/client/netmap" "github.com/nspcc-dev/neofs-node/pkg/morph/event" neofsEvent "github.com/nspcc-dev/neofs-node/pkg/morph/event/neofs" "github.com/panjf2000/ants/v2" @@ -40,7 +40,7 @@ type ( pool *ants.Pool neofsContract util.Uint160 balanceClient *balance.Client - netmapClient *nmWrapper.Wrapper + netmapClient *nmClient.Client morphClient *client.Client epochState EpochState alphabetState AlphabetState @@ -61,7 +61,7 @@ type ( NeoFSContract util.Uint160 NeoFSIDClient *neofsid.Client BalanceClient *balance.Client - NetmapClient *nmWrapper.Wrapper + NetmapClient *nmClient.Client MorphClient *client.Client EpochState EpochState AlphabetState AlphabetState diff --git a/pkg/innerring/processors/netmap/process_cleanup.go b/pkg/innerring/processors/netmap/process_cleanup.go index 1bd7cee06a..9ddd4b1ce7 100644 --- a/pkg/innerring/processors/netmap/process_cleanup.go +++ b/pkg/innerring/processors/netmap/process_cleanup.go @@ -2,7 +2,7 @@ package netmap import ( "github.com/nspcc-dev/neo-go/pkg/crypto/keys" - netmapclient "github.com/nspcc-dev/neofs-node/pkg/morph/client/netmap/wrapper" + netmapclient "github.com/nspcc-dev/neofs-node/pkg/morph/client/netmap" "github.com/nspcc-dev/neofs-sdk-go/netmap" "go.uber.org/zap" ) diff --git a/pkg/innerring/processors/netmap/process_peers.go b/pkg/innerring/processors/netmap/process_peers.go index 4294de4746..6306a65078 100644 --- a/pkg/innerring/processors/netmap/process_peers.go +++ b/pkg/innerring/processors/netmap/process_peers.go @@ -6,7 +6,7 @@ import ( "sort" "strings" - netmapclient "github.com/nspcc-dev/neofs-node/pkg/morph/client/netmap/wrapper" + netmapclient "github.com/nspcc-dev/neofs-node/pkg/morph/client/netmap" netmapEvent "github.com/nspcc-dev/neofs-node/pkg/morph/event/netmap" subnetEvent "github.com/nspcc-dev/neofs-node/pkg/morph/event/subnet" "github.com/nspcc-dev/neofs-sdk-go/netmap" diff --git a/pkg/innerring/processors/netmap/processor.go b/pkg/innerring/processors/netmap/processor.go index 0d135117a9..c8a225c85e 100644 --- a/pkg/innerring/processors/netmap/processor.go +++ b/pkg/innerring/processors/netmap/processor.go @@ -7,7 +7,7 @@ import ( "github.com/nspcc-dev/neo-go/pkg/core/mempoolevent" "github.com/nspcc-dev/neo-go/pkg/util" container "github.com/nspcc-dev/neofs-node/pkg/morph/client/container/wrapper" - nmWrapper "github.com/nspcc-dev/neofs-node/pkg/morph/client/netmap/wrapper" + nmClient "github.com/nspcc-dev/neofs-node/pkg/morph/client/netmap" "github.com/nspcc-dev/neofs-node/pkg/morph/event" netmapEvent "github.com/nspcc-dev/neofs-node/pkg/morph/event/netmap" subnetEvent "github.com/nspcc-dev/neofs-node/pkg/morph/event/subnet" @@ -59,7 +59,7 @@ type ( epochState EpochState alphabetState AlphabetState - netmapClient *nmWrapper.Wrapper + netmapClient *nmClient.Client containerWrp *container.Wrapper subnetContract util.Uint160 @@ -80,7 +80,7 @@ type ( Params struct { Log *zap.Logger PoolSize int - NetmapClient *nmWrapper.Wrapper + NetmapClient *nmClient.Client EpochTimer EpochTimerReseter EpochState EpochState AlphabetState AlphabetState diff --git a/pkg/morph/client/netmap/add_peer.go b/pkg/morph/client/netmap/add_peer.go index f501a7c6f6..4211785390 100644 --- a/pkg/morph/client/netmap/add_peer.go +++ b/pkg/morph/client/netmap/add_peer.go @@ -4,29 +4,37 @@ import ( "fmt" "github.com/nspcc-dev/neofs-node/pkg/morph/client" + "github.com/nspcc-dev/neofs-sdk-go/netmap" ) -// AddPeerArgs groups the arguments -// of add peer invocation call. -type AddPeerArgs struct { - info []byte +// AddPeerPrm groups parameters of AddPeer operation. +type AddPeerPrm struct { + nodeInfo *netmap.NodeInfo client.InvokePrmOptional } -// SetInfo sets the peer information. -func (a *AddPeerArgs) SetInfo(v []byte) { - a.info = v +// SetNodeInfo sets new peer NodeInfo. +func (a *AddPeerPrm) SetNodeInfo(nodeInfo *netmap.NodeInfo) { + a.nodeInfo = nodeInfo } -// AddPeer invokes the call of add peer method -// of NeoFS Netmap contract. -func (c *Client) AddPeer(args AddPeerArgs) error { - prm := client.InvokePrm{} +// AddPeer registers peer in NeoFS network through +// Netmap contract call. +func (c *Client) AddPeer(p AddPeerPrm) error { + if p.nodeInfo == nil { + return fmt.Errorf("nil node info (%s)", addPeerMethod) + } + rawNodeInfo, err := p.nodeInfo.Marshal() + if err != nil { + return fmt.Errorf("can't marshal node info (%s): %w", addPeerMethod, err) + } + + prm := client.InvokePrm{} prm.SetMethod(addPeerMethod) - prm.SetArgs(args.info) - prm.InvokePrmOptional = args.InvokePrmOptional + prm.SetArgs(rawNodeInfo) + prm.InvokePrmOptional = p.InvokePrmOptional if err := c.client.Invoke(prm); err != nil { return fmt.Errorf("could not invoke method (%s): %w", addPeerMethod, err) diff --git a/pkg/morph/client/netmap/client.go b/pkg/morph/client/netmap/client.go index 569f38cf40..a8849546ef 100644 --- a/pkg/morph/client/netmap/client.go +++ b/pkg/morph/client/netmap/client.go @@ -1,6 +1,10 @@ package netmap import ( + "fmt" + + "github.com/nspcc-dev/neo-go/pkg/encoding/fixedn" + "github.com/nspcc-dev/neo-go/pkg/util" "github.com/nspcc-dev/neofs-node/pkg/morph/client" "github.com/nspcc-dev/neofs-sdk-go/netmap" ) @@ -38,9 +42,54 @@ const ( configListMethod = "listConfig" ) -// New creates, initializes and returns the Client instance. -func New(c *client.StaticClient) *Client { - return &Client{client: c} +// NewFromMorph returns the wrapper instance from the raw morph client. +func NewFromMorph(cli *client.Client, contract util.Uint160, fee fixedn.Fixed8, opts ...Option) (*Client, error) { + o := defaultOpts() + + for i := range opts { + opts[i](o) + } + + sc, err := client.NewStatic(cli, contract, fee, ([]client.StaticClientOption)(*o)...) + if err != nil { + return nil, fmt.Errorf("can't create netmap static client: %w", err) + } + + return &Client{client: sc}, nil +} + +// Option allows to set an optional +// parameter of Wrapper. +type Option func(*opts) + +type opts []client.StaticClientOption + +func defaultOpts() *opts { + return new(opts) +} + +// 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 +// of notary requests with client's private +// key. +// +// Considered to be used by IR nodes only. +func AsAlphabet() Option { + return func(o *opts) { + *o = append(*o, client.AsAlphabet()) + } +} + +// ContractAddress returns the address of the associated contract. +func (c Client) ContractAddress() util.Uint160 { + return c.client.ContractAddress() } // Morph returns raw morph client. diff --git a/pkg/morph/client/netmap/config.go b/pkg/morph/client/netmap/config.go index 4ffc28a1ed..9308152e46 100644 --- a/pkg/morph/client/netmap/config.go +++ b/pkg/morph/client/netmap/config.go @@ -2,60 +2,153 @@ package netmap import ( "fmt" + "strconv" + "github.com/nspcc-dev/neo-go/pkg/encoding/bigint" "github.com/nspcc-dev/neo-go/pkg/vm/stackitem" "github.com/nspcc-dev/neofs-node/pkg/morph/client" ) -// ConfigArgs groups the arguments -// of get config value test invoke call. -type ConfigArgs struct { - key []byte -} +const ( + maxObjectSizeConfig = "MaxObjectSize" + basicIncomeRateConfig = "BasicIncomeRate" + auditFeeConfig = "AuditFee" + epochDurationConfig = "EpochDuration" + containerFeeConfig = "ContainerFee" + containerAliasFeeConfig = "ContainerAliasFee" + etIterationsConfig = "EigenTrustIterations" + etAlphaConfig = "EigenTrustAlpha" + irCandidateFeeConfig = "InnerRingCandidateFee" + withdrawFeeConfig = "WithdrawFee" +) -// SetKey sets binary key to configuration parameter. -func (c *ConfigArgs) SetKey(v []byte) { - c.key = v -} - -// ConfigValues groups the stack parameters -// returned by get config test invoke. -type ConfigValues struct { - val interface{} -} - -// Value returns configuration value. -func (c ConfigValues) Value() interface{} { - return c.val -} - -// Config performs the test invoke of get config value -// method of NeoFS Netmap contract. -func (c *Client) Config(args ConfigArgs, assert func(stackitem.Item) (interface{}, error)) (*ConfigValues, error) { - prm := client.TestInvokePrm{} - - prm.SetMethod(configMethod) - prm.SetArgs(args.key) - - items, err := c.client.TestInvoke(prm) +// MaxObjectSize receives max object size configuration +// value through the Netmap contract call. +func (c *Client) MaxObjectSize() (uint64, error) { + objectSize, err := c.readUInt64Config(maxObjectSizeConfig) if err != nil { - return nil, fmt.Errorf("could not perform test invocation (%s): %w", - configMethod, err) + return 0, fmt.Errorf("(%T) could not get epoch number: %w", c, err) } - if ln := len(items); ln != 1 { - return nil, fmt.Errorf("unexpected stack item count (%s): %d", - configMethod, ln) - } + return objectSize, nil +} - val, err := assert(items[0]) +// BasicIncomeRate returns basic income rate configuration value from network +// config in netmap contract. +func (c *Client) BasicIncomeRate() (uint64, error) { + rate, err := c.readUInt64Config(basicIncomeRateConfig) if err != nil { - return nil, fmt.Errorf("value type assertion failed: %w", err) + return 0, fmt.Errorf("(%T) could not get basic income rate: %w", c, err) } - return &ConfigValues{ - val: val, - }, nil + return rate, nil +} + +// AuditFee returns audit fee configuration value from network +// config in netmap contract. +func (c *Client) AuditFee() (uint64, error) { + fee, err := c.readUInt64Config(auditFeeConfig) + if err != nil { + return 0, fmt.Errorf("(%T) could not get audit fee: %w", c, err) + } + + return fee, nil +} + +// EpochDuration returns number of sidechain blocks per one NeoFS epoch. +func (c *Client) EpochDuration() (uint64, error) { + epochDuration, err := c.readUInt64Config(epochDurationConfig) + if err != nil { + return 0, fmt.Errorf("(%T) could not get epoch duration: %w", c, err) + } + + return epochDuration, nil +} + +// ContainerFee returns fee paid by container owner to each alphabet node +// for container registration. +func (c *Client) ContainerFee() (uint64, error) { + fee, err := c.readUInt64Config(containerFeeConfig) + if err != nil { + return 0, fmt.Errorf("(%T) could not get container fee: %w", c, err) + } + + return fee, nil +} + +// ContainerAliasFee returns additional fee paid by container owner to each +// alphabet node for container nice name registration. +func (c *Client) ContainerAliasFee() (uint64, error) { + fee, err := c.readUInt64Config(containerAliasFeeConfig) + if err != nil { + return 0, fmt.Errorf("(%T) could not get container alias fee: %w", c, err) + } + + return fee, nil +} + +// EigenTrustIterations returns global configuration value of iteration cycles +// for EigenTrust algorithm per epoch. +func (c *Client) EigenTrustIterations() (uint64, error) { + iterations, err := c.readUInt64Config(etIterationsConfig) + if err != nil { + return 0, fmt.Errorf("(%T) could not get eigen trust iterations: %w", c, err) + } + + return iterations, nil +} + +// EigenTrustAlpha returns global configuration value of alpha parameter. +// It receives the alpha as a string and tries to convert it to float. +func (c *Client) EigenTrustAlpha() (float64, error) { + strAlpha, err := c.readStringConfig(etAlphaConfig) + if err != nil { + return 0, fmt.Errorf("(%T) could not get eigen trust alpha: %w", c, err) + } + + return strconv.ParseFloat(strAlpha, 64) +} + +// InnerRingCandidateFee returns global configuration value of fee paid by +// node to be in inner ring candidates list. +func (c *Client) InnerRingCandidateFee() (uint64, error) { + fee, err := c.readUInt64Config(irCandidateFeeConfig) + if err != nil { + return 0, fmt.Errorf("(%T) could not get inner ring candidate fee: %w", c, err) + } + + return fee, nil +} + +// WithdrawFee returns global configuration value of fee paid by user to +// withdraw assets from NeoFS contract. +func (c *Client) WithdrawFee() (uint64, error) { + fee, err := c.readUInt64Config(withdrawFeeConfig) + if err != nil { + return 0, fmt.Errorf("(%T) could not get withdraw fee: %w", c, err) + } + + return fee, nil +} + +func (c *Client) readUInt64Config(key string) (uint64, error) { + v, err := c.config([]byte(key), IntegerAssert) + if err != nil { + return 0, err + } + + // IntegerAssert is guaranteed to return int64 if the error is nil. + return uint64(v.(int64)), nil +} + +func (c *Client) readStringConfig(key string) (string, error) { + v, err := c.config([]byte(key), StringAssert) + if err != nil { + return "", err + } + + // StringAssert is guaranteed to return string if the error is nil. + return v.(string), nil } // SetConfigPrm groups parameters of SetConfig operation. @@ -82,42 +175,134 @@ func (s *SetConfigPrm) SetValue(value interface{}) { s.value = value } -// SetConfig invokes `setConfig` method of NeoFS Netmap contract. -func (c *Client) SetConfig(args SetConfigPrm) error { +// SetConfig sets config field. +func (c *Client) SetConfig(p SetConfigPrm) error { prm := client.InvokePrm{} - prm.SetMethod(setConfigMethod) - prm.SetArgs(args.id, args.key, args.value) - prm.InvokePrmOptional = args.InvokePrmOptional + prm.SetArgs(p.id, p.key, p.value) + prm.InvokePrmOptional = p.InvokePrmOptional return c.client.Invoke(prm) } +// IterateConfigParameters iterates over configuration parameters stored in Netmap contract and passes them to f. +// +// Returns f's errors directly. +func (c *Client) IterateConfigParameters(f func(key, value []byte) error) error { + prm := client.TestInvokePrm{} + prm.SetMethod(configListMethod) + + items, err := c.client.TestInvoke(prm) + if err != nil { + return fmt.Errorf("could not perform test invocation (%s): %w", + configListMethod, err) + } + + if ln := len(items); ln != 1 { + return fmt.Errorf("unexpected stack item count (%s): %d", configListMethod, ln) + } + + arr, err := client.ArrayFromStackItem(items[0]) + if err != nil { + return fmt.Errorf("record list (%s): %w", configListMethod, err) + } + + return iterateRecords(arr, func(key, value []byte) error { + return f(key, value) + }) +} + +// ConfigWriter is an interface of NeoFS network config writer. +type ConfigWriter interface { + UnknownParameter(string, []byte) + MaxObjectSize(uint64) + BasicIncomeRate(uint64) + AuditFee(uint64) + EpochDuration(uint64) + ContainerFee(uint64) + ContainerAliasFee(uint64) + EigenTrustIterations(uint64) + EigenTrustAlpha(float64) + InnerRingCandidateFee(uint64) + WithdrawFee(uint64) +} + +// WriteConfig writes NeoFS network configuration received via iterator. +// +// Returns iterator's errors directly. +func WriteConfig(dst ConfigWriter, iterator func(func(key, val []byte) error) error) error { + return iterator(func(key, val []byte) error { + switch k := string(key); k { + default: + dst.UnknownParameter(k, val) + case maxObjectSizeConfig: + dst.MaxObjectSize(bigint.FromBytes(val).Uint64()) + case basicIncomeRateConfig: + dst.BasicIncomeRate(bigint.FromBytes(val).Uint64()) + case auditFeeConfig: + dst.AuditFee(bigint.FromBytes(val).Uint64()) + case epochDurationConfig: + dst.EpochDuration(bigint.FromBytes(val).Uint64()) + case containerFeeConfig: + dst.ContainerFee(bigint.FromBytes(val).Uint64()) + case containerAliasFeeConfig: + dst.ContainerAliasFee(bigint.FromBytes(val).Uint64()) + case etIterationsConfig: + dst.EigenTrustIterations(bigint.FromBytes(val).Uint64()) + case etAlphaConfig: + v, err := strconv.ParseFloat(string(val), 64) + if err != nil { + return fmt.Errorf("prm %s: %v", etAlphaConfig, err) + } + + dst.EigenTrustAlpha(v) + case irCandidateFeeConfig: + dst.InnerRingCandidateFee(bigint.FromBytes(val).Uint64()) + case withdrawFeeConfig: + dst.WithdrawFee(bigint.FromBytes(val).Uint64()) + } + + return nil + }) +} + +// config performs the test invoke of get config value +// method of NeoFS Netmap contract. +func (c *Client) config(key []byte, assert func(stackitem.Item) (interface{}, error)) (interface{}, error) { + prm := client.TestInvokePrm{} + prm.SetMethod(configMethod) + prm.SetArgs(key) + + items, err := c.client.TestInvoke(prm) + if err != nil { + return nil, fmt.Errorf("could not perform test invocation (%s): %w", + configMethod, err) + } + + if ln := len(items); ln != 1 { + return nil, fmt.Errorf("unexpected stack item count (%s): %d", + configMethod, ln) + } + + return assert(items[0]) +} + +// IntegerAssert converts stack item to int64. func IntegerAssert(item stackitem.Item) (interface{}, error) { return client.IntFromStackItem(item) } +// StringAssert converts stack item to string. func StringAssert(item stackitem.Item) (interface{}, error) { return client.StringFromStackItem(item) } -// ListConfigArgs groups the arguments -// of config listing test invoke call. -type ListConfigArgs struct { -} - -// ListConfigValues groups the stack parameters -// returned by config listing test invoke. -type ListConfigValues struct { - rs []stackitem.Item -} - -// IterateRecords iterates over all config records and passes them to f. +// iterateRecords iterates over all config records and passes them to f. // // Returns f's errors directly. -func (x ListConfigValues) IterateRecords(f func(key, value []byte) error) error { - for i := range x.rs { - fields, err := client.ArrayFromStackItem(x.rs[i]) +func iterateRecords(arr []stackitem.Item, f func(key, value []byte) error) error { + for i := range arr { + fields, err := client.ArrayFromStackItem(arr[i]) if err != nil { return fmt.Errorf("record fields: %w", err) } @@ -143,31 +328,3 @@ func (x ListConfigValues) IterateRecords(f func(key, value []byte) error) error return nil } - -// ListConfig performs the test invoke of config listing method of NeoFS Netmap contract. -func (c *Client) ListConfig(_ ListConfigArgs) (*ListConfigValues, error) { - prm := client.TestInvokePrm{} - - prm.SetMethod(configListMethod) - - items, err := c.client.TestInvoke(prm) - if err != nil { - return nil, fmt.Errorf("could not perform test invocation (%s): %w", - configListMethod, err) - } - - if ln := len(items); ln != 1 { - return nil, fmt.Errorf("unexpected stack item count (%s): %d", - configListMethod, ln) - } - - arr, err := client.ArrayFromStackItem(items[0]) - if err != nil { - return nil, fmt.Errorf("record list (%s): %w", - configListMethod, err) - } - - return &ListConfigValues{ - rs: arr, - }, nil -} diff --git a/pkg/morph/client/netmap/epoch.go b/pkg/morph/client/netmap/epoch.go index ece5ffec20..489554b390 100644 --- a/pkg/morph/client/netmap/epoch.go +++ b/pkg/morph/client/netmap/epoch.go @@ -6,87 +6,51 @@ import ( "github.com/nspcc-dev/neofs-node/pkg/morph/client" ) -// EpochArgs groups the arguments -// of get epoch number test invoke call. -type EpochArgs struct{} - -// EpochValues groups the stack parameters -// returned by get epoch number test invoke. -type EpochValues struct { - num int64 -} - -// Number return the number of NeoFS epoch. -func (e EpochValues) Number() int64 { - return e.num -} - -// Epoch performs the test invoke of get epoch number -// method of NeoFS Netmap contract. -func (c *Client) Epoch(_ EpochArgs) (*EpochValues, error) { +// Epoch receives number of current NeoFS epoch +// through the Netmap contract call. +func (c *Client) Epoch() (uint64, error) { prm := client.TestInvokePrm{} prm.SetMethod(epochMethod) items, err := c.client.TestInvoke(prm) if err != nil { - return nil, fmt.Errorf("could not perform test invocation (%s): %w", + return 0, fmt.Errorf("could not perform test invocation (%s): %w", epochMethod, err) } if ln := len(items); ln != 1 { - return nil, fmt.Errorf("unexpected stack item count (%s): %d", + return 0, fmt.Errorf("unexpected stack item count (%s): %d", epochMethod, ln) } num, err := client.IntFromStackItem(items[0]) if err != nil { - return nil, fmt.Errorf("could not get number from stack item (%s): %w", epochMethod, err) + return 0, fmt.Errorf("could not get number from stack item (%s): %w", epochMethod, err) } - - return &EpochValues{ - num: num, - }, nil + return uint64(num), nil } -// EpochBlockArgs groups the arguments of -// get epoch block number test invoke call. -type EpochBlockArgs struct{} - -// EpochBlockValues groups the stack parameters -// returned by get epoch block number test invoke. -type EpochBlockValues struct { - block int64 -} - -// Block return the block number of NeoFS epoch. -func (e EpochBlockValues) Block() int64 { - return e.block -} - -// LastEpochBlock performs the test invoke of get epoch block number -// method of NeoFS Netmap contract. -func (c *Client) LastEpochBlock(_ EpochBlockArgs) (*EpochBlockValues, error) { +// LastEpochBlock receives block number of current NeoFS epoch +// through the Netmap contract call. +func (c *Client) LastEpochBlock() (uint32, error) { prm := client.TestInvokePrm{} prm.SetMethod(lastEpochBlockMethod) items, err := c.client.TestInvoke(prm) if err != nil { - return nil, fmt.Errorf("could not perform test invocation (%s): %w", + return 0, fmt.Errorf("could not perform test invocation (%s): %w", lastEpochBlockMethod, err) } if ln := len(items); ln != 1 { - return nil, fmt.Errorf("unexpected stack item count (%s): %d", + return 0, fmt.Errorf("unexpected stack item count (%s): %d", lastEpochBlockMethod, ln) } block, err := client.IntFromStackItem(items[0]) if err != nil { - return nil, fmt.Errorf("could not get number from stack item (%s): %w", + return 0, fmt.Errorf("could not get number from stack item (%s): %w", lastEpochBlockMethod, err) } - - return &EpochBlockValues{ - block: block, - }, nil + return uint32(block), nil } diff --git a/pkg/morph/client/netmap/innerring.go b/pkg/morph/client/netmap/innerring.go index cc2b51c068..ad812cf76d 100644 --- a/pkg/morph/client/netmap/innerring.go +++ b/pkg/morph/client/netmap/innerring.go @@ -22,16 +22,14 @@ func (u *UpdateIRPrm) SetKeys(keys keys.PublicKeys) { u.keys = keys } -// UpdateInnerRing updates inner ring members in netmap contract. +// UpdateInnerRing updates inner ring keys. func (c *Client) UpdateInnerRing(p UpdateIRPrm) error { args := make([][]byte, len(p.keys)) - for i := range args { args[i] = p.keys[i].Bytes() } prm := client.InvokePrm{} - prm.SetMethod(updateInnerRingMethod) prm.SetArgs(args) prm.InvokePrmOptional = p.InvokePrmOptional @@ -39,9 +37,8 @@ func (c *Client) UpdateInnerRing(p UpdateIRPrm) error { return c.client.Invoke(prm) } -// InnerRingList returns public keys of inner ring members in -// netmap contract. -func (c *Client) InnerRingList() (keys.PublicKeys, error) { +// GetInnerRingList return current IR list. +func (c *Client) GetInnerRingList() (keys.PublicKeys, error) { invokePrm := client.TestInvokePrm{} invokePrm.SetMethod(innerRingListMethod) diff --git a/pkg/morph/client/netmap/netmap.go b/pkg/morph/client/netmap/netmap.go index 0b0b14c60c..08c64aadae 100644 --- a/pkg/morph/client/netmap/netmap.go +++ b/pkg/morph/client/netmap/netmap.go @@ -5,14 +5,9 @@ import ( "github.com/nspcc-dev/neo-go/pkg/vm/stackitem" "github.com/nspcc-dev/neofs-node/pkg/morph/client" + "github.com/nspcc-dev/neofs-sdk-go/netmap" ) -// GetNetMapValues groups the stack parameters -// returned by get network map test invoke. -type GetNetMapValues struct { - peers [][]byte -} - // State is an enumeration of various states of the NeoFS node. type State int64 @@ -48,117 +43,27 @@ const ( peerWithStateFixedPrmNumber = 2 ) -// Peers return the list of peers from -// network map in a binary format. -func (g GetNetMapValues) Peers() [][]byte { - return g.peers -} - -// GetNetMapArgs groups the arguments -// of get network map test invoke call. -type GetNetMapArgs struct{} - -// NetMap performs the test invoke of get network map -// method of NeoFS Netmap contract. -func (c *Client) NetMap(_ GetNetMapArgs) (*GetNetMapValues, error) { +// GetNetMapByEpoch receives information list about storage nodes +// through the Netmap contract call, composes network map +// from them and returns it. Returns snapshot of the specified epoch number. +func (c *Client) GetNetMapByEpoch(epoch uint64) (*netmap.Netmap, error) { invokePrm := client.TestInvokePrm{} - invokePrm.SetMethod(netMapMethod) - - prms, err := c.client.TestInvoke(invokePrm) - if err != nil { - return nil, fmt.Errorf("could not perform test invocation (%s): %w", - netMapMethod, err) - } - - return peersFromStackItems(prms, netMapMethod) -} - -// GetSnapshotArgs groups the arguments -// of get netmap snapshot test invoke call. -type GetSnapshotArgs struct { - diff uint64 -} - -// SetDiff sets argument for snapshot method of -// netmap contract. -func (g *GetSnapshotArgs) SetDiff(d uint64) { - g.diff = d -} - -// Snapshot performs the test invoke of get snapshot of network map -// from NeoFS Netmap contract. Contract saves only one previous epoch, -// so all invokes with diff > 1 return error. -func (c *Client) Snapshot(a GetSnapshotArgs) (*GetNetMapValues, error) { - invokePrm := client.TestInvokePrm{} - - invokePrm.SetMethod(snapshotMethod) - invokePrm.SetArgs(int64(a.diff)) - - prms, err := c.client.TestInvoke(invokePrm) - if err != nil { - return nil, fmt.Errorf("could not perform test invocation (%s): %w", - netMapMethod, err) - } - - return peersFromStackItems(prms, snapshotMethod) -} - -// EpochSnapshotArgs groups the arguments -// of snapshot by epoch test invoke call. -type EpochSnapshotArgs struct { - epoch uint64 -} - -// SetEpoch sets epoch number to get snapshot. -func (a *EpochSnapshotArgs) SetEpoch(d uint64) { - a.epoch = d -} - -// EpochSnapshotValues groups the stack parameters -// returned by snapshot by epoch test invoke. -type EpochSnapshotValues struct { - *GetNetMapValues -} - -// EpochSnapshot performs the test invoke of get snapshot of network map by epoch -// from NeoFS Netmap contract. -func (c *Client) EpochSnapshot(args EpochSnapshotArgs) (*EpochSnapshotValues, error) { - invokePrm := client.TestInvokePrm{} - invokePrm.SetMethod(epochSnapshotMethod) - invokePrm.SetArgs(int64(args.epoch)) + invokePrm.SetArgs(int64(epoch)) - prms, err := c.client.TestInvoke(invokePrm) + res, err := c.client.TestInvoke(invokePrm) if err != nil { return nil, fmt.Errorf("could not perform test invocation (%s): %w", epochSnapshotMethod, err) } - nmVals, err := peersFromStackItems(prms, epochSnapshotMethod) - if err != nil { - return nil, err - } - - return &EpochSnapshotValues{ - GetNetMapValues: nmVals, - }, nil + return unmarshalNetmap(res, epochSnapshotMethod) } -// GetNetMapCandidatesArgs groups the arguments -// of get network map candidates test invoke call. -type GetNetMapCandidatesArgs struct{} - -// GetNetMapCandidatesValues groups the stack parameters -// returned by get network map candidates test invoke. -type GetNetMapCandidatesValues struct { - netmapNodes []*PeerWithState -} - -func (g GetNetMapCandidatesValues) NetmapNodes() []*PeerWithState { - return g.netmapNodes -} - -func (c *Client) Candidates(_ GetNetMapCandidatesArgs) (*GetNetMapCandidatesValues, error) { +// GetCandidates receives information list about candidates +// for the next epoch network map through the Netmap contract +// call, composes network map from them and returns it. +func (c *Client) GetCandidates() (*netmap.Netmap, error) { invokePrm := client.TestInvokePrm{} invokePrm.SetMethod(netMapCandidatesMethod) @@ -172,10 +77,49 @@ func (c *Client) Candidates(_ GetNetMapCandidatesArgs) (*GetNetMapCandidatesValu return nil, fmt.Errorf("could not parse contract response: %w", err) } - return candVals, nil + return unmarshalCandidates(candVals) } -func peersWithStateFromStackItems(stack []stackitem.Item, method string) (*GetNetMapCandidatesValues, error) { +// NetMap performs the test invoke of get network map +// method of NeoFS Netmap contract. +func (c *Client) NetMap() ([][]byte, error) { + invokePrm := client.TestInvokePrm{} + invokePrm.SetMethod(netMapMethod) + + prms, err := c.client.TestInvoke(invokePrm) + if err != nil { + return nil, fmt.Errorf("could not perform test invocation (%s): %w", + netMapMethod, err) + } + + return peersFromStackItems(prms, netMapMethod) +} + +func unmarshalCandidates(rawCandidate []*PeerWithState) (*netmap.Netmap, error) { + candidates := make([]netmap.NodeInfo, 0, len(rawCandidate)) + + for _, candidate := range rawCandidate { + nodeInfo := netmap.NewNodeInfo() + if err := nodeInfo.Unmarshal(candidate.Peer()); err != nil { + return nil, fmt.Errorf("can't unmarshal peer info: %w", err) + } + + switch candidate.State() { + case Online: + nodeInfo.SetState(netmap.NodeStateOnline) + case Offline: + nodeInfo.SetState(netmap.NodeStateOffline) + default: + nodeInfo.SetState(0) + } + + candidates = append(candidates, *nodeInfo) + } + + return netmap.NewNetmap(netmap.NodesFromInfo(candidates)) +} + +func peersWithStateFromStackItems(stack []stackitem.Item, method string) ([]*PeerWithState, error) { if ln := len(stack); ln != 1 { return nil, fmt.Errorf("unexpected stack item count (%s): %d", method, ln) } @@ -185,17 +129,14 @@ func peersWithStateFromStackItems(stack []stackitem.Item, method string) (*GetNe return nil, fmt.Errorf("could not get stack item array from stack item (%s): %w", method, err) } - res := &GetNetMapCandidatesValues{ - netmapNodes: make([]*PeerWithState, 0, len(netmapNodes)), - } - + res := make([]*PeerWithState, 0, len(netmapNodes)) for i := range netmapNodes { node, err := peerWithStateFromStackItem(netmapNodes[i]) if err != nil { return nil, fmt.Errorf("could not parse stack item (Peer #%d): %w", i, err) } - res.netmapNodes = append(res.netmapNodes, node) + res = append(res, node) } return res, nil @@ -238,7 +179,7 @@ func peerWithStateFromStackItem(prm stackitem.Item) (*PeerWithState, error) { return &res, nil } -func peersFromStackItems(stack []stackitem.Item, method string) (*GetNetMapValues, error) { +func peersFromStackItems(stack []stackitem.Item, method string) ([][]byte, error) { if ln := len(stack); ln != 1 { return nil, fmt.Errorf("unexpected stack item count (%s): %d", method, ln) @@ -250,9 +191,7 @@ func peersFromStackItems(stack []stackitem.Item, method string) (*GetNetMapValue method, err) } - res := &GetNetMapValues{ - peers: make([][]byte, 0, len(peers)), - } + res := make([][]byte, 0, len(peers)) for i := range peers { peer, err := peerInfoFromStackItem(peers[i]) @@ -260,7 +199,7 @@ func peersFromStackItems(stack []stackitem.Item, method string) (*GetNetMapValue return nil, fmt.Errorf("could not parse stack item (Peer #%d): %w", i, err) } - res.peers = append(res.peers, peer) + res = append(res, peer) } return res, nil diff --git a/pkg/morph/client/netmap/new_epoch.go b/pkg/morph/client/netmap/new_epoch.go index bf5b37b99b..7a8a672f20 100644 --- a/pkg/morph/client/netmap/new_epoch.go +++ b/pkg/morph/client/netmap/new_epoch.go @@ -6,27 +6,12 @@ import ( "github.com/nspcc-dev/neofs-node/pkg/morph/client" ) -// NewEpochArgs groups the arguments -// of new epoch invocation call. -type NewEpochArgs struct { - number int64 // new epoch number - - client.InvokePrmOptional -} - -// SetEpochNumber sets the new epoch number. -func (a *NewEpochArgs) SetEpochNumber(v int64) { - a.number = v -} - -// NewEpoch invokes the call of new epoch method -// of NeoFS Netmap contract. -func (c *Client) NewEpoch(args NewEpochArgs) error { +// NewEpoch updates NeoFS epoch number through +// Netmap contract call. +func (c *Client) NewEpoch(epoch uint64) error { prm := client.InvokePrm{} - prm.SetMethod(newEpochMethod) - prm.SetArgs(args.number) - prm.InvokePrmOptional = args.InvokePrmOptional + prm.SetArgs(int64(epoch)) if err := c.client.Invoke(prm); err != nil { return fmt.Errorf("could not invoke method (%s): %w", newEpochMethod, err) diff --git a/pkg/morph/client/netmap/snapshot.go b/pkg/morph/client/netmap/snapshot.go new file mode 100644 index 0000000000..9cecf28168 --- /dev/null +++ b/pkg/morph/client/netmap/snapshot.go @@ -0,0 +1,52 @@ +package netmap + +import ( + "fmt" + + "github.com/nspcc-dev/neo-go/pkg/vm/stackitem" + "github.com/nspcc-dev/neofs-node/pkg/morph/client" + "github.com/nspcc-dev/neofs-sdk-go/netmap" +) + +// GetNetMap receives information list about storage nodes +// through the Netmap contract call, composes network map +// from them and returns it. With diff == 0 returns current +// network map, else return snapshot of previous network map. +func (c *Client) GetNetMap(diff uint64) (*netmap.Netmap, error) { + return c.getNetMap(diff) +} + +// Snapshot returns current netmap node infos. +// Consider using pkg/morph/client/netmap for this. +func (c *Client) Snapshot() (*netmap.Netmap, error) { + return c.getNetMap(0) +} + +func (c *Client) getNetMap(diff uint64) (*netmap.Netmap, error) { + prm := client.TestInvokePrm{} + prm.SetMethod(snapshotMethod) + prm.SetArgs(int64(diff)) + + res, err := c.client.TestInvoke(prm) + if err != nil { + return nil, err + } + + return unmarshalNetmap(res, snapshotMethod) +} + +func unmarshalNetmap(items []stackitem.Item, method string) (*netmap.Netmap, error) { + rawPeers, err := peersFromStackItems(items, method) + if err != nil { + return nil, err + } + + result := make([]netmap.NodeInfo, len(rawPeers)) + for i := range rawPeers { + if err := result[i].Unmarshal(rawPeers[i]); err != nil { + return nil, fmt.Errorf("can't unmarshal node info (%s): %w", method, err) + } + } + + return netmap.NewNetmap(netmap.NodesFromInfo(result)) +} diff --git a/pkg/morph/client/netmap/update_state.go b/pkg/morph/client/netmap/update_state.go index dd677ad9ed..695478f19d 100644 --- a/pkg/morph/client/netmap/update_state.go +++ b/pkg/morph/client/netmap/update_state.go @@ -4,42 +4,36 @@ import ( "fmt" "github.com/nspcc-dev/neofs-node/pkg/morph/client" + "github.com/nspcc-dev/neofs-sdk-go/netmap" ) -// UpdateStateArgs groups the arguments -// of update state invocation call. -type UpdateStateArgs struct { - key []byte // peer public key - - state int64 // new peer state +// UpdatePeerPrm groups parameters of UpdatePeerState operation. +type UpdatePeerPrm struct { + key []byte + state netmap.NodeState client.InvokePrmOptional } -// SetPublicKey sets peer public key -// in a binary format. -func (u *UpdateStateArgs) SetPublicKey(v []byte) { - u.key = v +// SetKey sets public key. +func (u *UpdatePeerPrm) SetKey(key []byte) { + u.key = key } -// SetState sets the new peer state. -func (u *UpdateStateArgs) SetState(v int64) { - u.state = v +// SetState sets node state. +func (u *UpdatePeerPrm) SetState(state netmap.NodeState) { + u.state = state } -// UpdateState invokes the call of update state method -// of NeoFS Netmap contract. -func (c *Client) UpdateState(args UpdateStateArgs) error { +// UpdatePeerState changes peer status through Netmap contract call. +func (c *Client) UpdatePeerState(p UpdatePeerPrm) error { prm := client.InvokePrm{} - prm.SetMethod(updateStateMethod) - prm.SetArgs(args.state, args.key) - prm.InvokePrmOptional = args.InvokePrmOptional + prm.SetArgs(int64(p.state.ToV2()), p.key) + prm.InvokePrmOptional = p.InvokePrmOptional - err := c.client.Invoke(prm) - if err != nil { - return fmt.Errorf("could not invoke method (%s): %w", updateStateMethod, err) + if err := c.client.Invoke(prm); err != nil { + return fmt.Errorf("could not invoke smart contract: %w", err) } - return nil } diff --git a/pkg/morph/client/netmap/wrapper/add_peer.go b/pkg/morph/client/netmap/wrapper/add_peer.go deleted file mode 100644 index 8c97124b70..0000000000 --- a/pkg/morph/client/netmap/wrapper/add_peer.go +++ /dev/null @@ -1,43 +0,0 @@ -package wrapper - -import ( - "errors" - "fmt" - - "github.com/nspcc-dev/neofs-node/pkg/morph/client" - "github.com/nspcc-dev/neofs-node/pkg/morph/client/netmap" -) - -// AddPeerPrm groups parameters of AddPeer operation. -type AddPeerPrm struct { - nodeInfo *netmap.NodeInfo - - client.InvokePrmOptional -} - -// SetNodeInfo sets new peer NodeInfo. -func (a *AddPeerPrm) SetNodeInfo(nodeInfo *netmap.NodeInfo) { - a.nodeInfo = nodeInfo -} - -// AddPeer registers peer in NeoFS network through -// Netmap contract call. -func (w *Wrapper) AddPeer(prm AddPeerPrm) error { - if prm.nodeInfo == nil { - return errors.New("nil node info") - } - - rawNodeInfo, err := prm.nodeInfo.Marshal() - if err != nil { - return err - } - - args := netmap.AddPeerArgs{} - args.SetInfo(rawNodeInfo) - args.InvokePrmOptional = prm.InvokePrmOptional - - if err := w.client.AddPeer(args); err != nil { - return fmt.Errorf("could not invoke smart contract: %w", err) - } - return nil -} diff --git a/pkg/morph/client/netmap/wrapper/config.go b/pkg/morph/client/netmap/wrapper/config.go deleted file mode 100644 index eac9df7a3c..0000000000 --- a/pkg/morph/client/netmap/wrapper/config.go +++ /dev/null @@ -1,276 +0,0 @@ -package wrapper - -import ( - "fmt" - "strconv" - - "github.com/nspcc-dev/neo-go/pkg/encoding/bigint" - "github.com/nspcc-dev/neofs-node/pkg/morph/client" - "github.com/nspcc-dev/neofs-node/pkg/morph/client/netmap" -) - -const ( - maxObjectSizeConfig = "MaxObjectSize" - basicIncomeRateConfig = "BasicIncomeRate" - auditFeeConfig = "AuditFee" - epochDurationConfig = "EpochDuration" - containerFeeConfig = "ContainerFee" - containerAliasFeeConfig = "ContainerAliasFee" - etIterationsConfig = "EigenTrustIterations" - etAlphaConfig = "EigenTrustAlpha" - irCandidateFeeConfig = "InnerRingCandidateFee" - withdrawFeeConfig = "WithdrawFee" -) - -// MaxObjectSize receives max object size configuration -// value through the Netmap contract call. -func (w *Wrapper) MaxObjectSize() (uint64, error) { - objectSize, err := w.readUInt64Config(maxObjectSizeConfig) - if err != nil { - return 0, fmt.Errorf("(%T) could not get epoch number: %w", w, err) - } - - return objectSize, nil -} - -// BasicIncomeRate returns basic income rate configuration value from network -// config in netmap contract. -func (w *Wrapper) BasicIncomeRate() (uint64, error) { - rate, err := w.readUInt64Config(basicIncomeRateConfig) - if err != nil { - return 0, fmt.Errorf("(%T) could not get basic income rate: %w", w, err) - } - - return rate, nil -} - -// AuditFee returns audit fee configuration value from network -// config in netmap contract. -func (w *Wrapper) AuditFee() (uint64, error) { - fee, err := w.readUInt64Config(auditFeeConfig) - if err != nil { - return 0, fmt.Errorf("(%T) could not get audit fee: %w", w, err) - } - - return fee, nil -} - -// EpochDuration returns number of sidechain blocks per one NeoFS epoch. -func (w *Wrapper) EpochDuration() (uint64, error) { - epochDuration, err := w.readUInt64Config(epochDurationConfig) - if err != nil { - return 0, fmt.Errorf("(%T) could not get epoch duration: %w", w, err) - } - - return epochDuration, nil -} - -// ContainerFee returns fee paid by container owner to each alphabet node -// for container registration. -func (w *Wrapper) ContainerFee() (uint64, error) { - fee, err := w.readUInt64Config(containerFeeConfig) - if err != nil { - return 0, fmt.Errorf("(%T) could not get container fee: %w", w, err) - } - - return fee, nil -} - -// ContainerAliasFee returns additional fee paid by container owner to each -// alphabet node for container nice name registration. -func (w *Wrapper) ContainerAliasFee() (uint64, error) { - fee, err := w.readUInt64Config(containerAliasFeeConfig) - if err != nil { - return 0, fmt.Errorf("(%T) could not get container alias fee: %w", w, err) - } - - return fee, nil -} - -// EigenTrustIterations returns global configuration value of iteration cycles -// for EigenTrust algorithm per epoch. -func (w *Wrapper) EigenTrustIterations() (uint64, error) { - iterations, err := w.readUInt64Config(etIterationsConfig) - if err != nil { - return 0, fmt.Errorf("(%T) could not get eigen trust iterations: %w", w, err) - } - - return iterations, nil -} - -// EigenTrustAlpha returns global configuration value of alpha parameter. -// It receives the alpha as a string and tries to convert it to float. -func (w *Wrapper) EigenTrustAlpha() (float64, error) { - strAlpha, err := w.readStringConfig(etAlphaConfig) - if err != nil { - return 0, fmt.Errorf("(%T) could not get eigen trust alpha: %w", w, err) - } - - return strconv.ParseFloat(strAlpha, 64) -} - -// InnerRingCandidateFee returns global configuration value of fee paid by -// node to be in inner ring candidates list. -func (w *Wrapper) InnerRingCandidateFee() (uint64, error) { - fee, err := w.readUInt64Config(irCandidateFeeConfig) - if err != nil { - return 0, fmt.Errorf("(%T) could not get inner ring candidate fee: %w", w, err) - } - - return fee, nil -} - -// WithdrawFee returns global configuration value of fee paid by user to -// withdraw assets from NeoFS contract. -func (w *Wrapper) WithdrawFee() (uint64, error) { - fee, err := w.readUInt64Config(withdrawFeeConfig) - if err != nil { - return 0, fmt.Errorf("(%T) could not get withdraw fee: %w", w, err) - } - - return fee, nil -} - -func (w *Wrapper) readUInt64Config(key string) (uint64, error) { - args := netmap.ConfigArgs{} - args.SetKey([]byte(key)) - - vals, err := w.client.Config(args, netmap.IntegerAssert) - if err != nil { - return 0, err - } - - v := vals.Value() - - numeric, ok := v.(int64) - if !ok { - return 0, fmt.Errorf("(%T) invalid value type %T", w, v) - } - - return uint64(numeric), nil -} - -func (w *Wrapper) readStringConfig(key string) (string, error) { - args := netmap.ConfigArgs{} - args.SetKey([]byte(key)) - - vals, err := w.client.Config(args, netmap.StringAssert) - if err != nil { - return "", err - } - - v := vals.Value() - - str, ok := v.(string) - if !ok { - return "", fmt.Errorf("(%T) invalid value type %T", w, v) - } - - return str, nil -} - -// SetConfigPrm groups parameters of SetConfig operation. -type SetConfigPrm struct { - id []byte - key []byte - value interface{} - - client.InvokePrmOptional -} - -// SetID sets ID of the config value. -func (s *SetConfigPrm) SetID(id []byte) { - s.id = id -} - -// SetKey sets key of the config value. -func (s *SetConfigPrm) SetKey(key []byte) { - s.key = key -} - -// SetValue sets value of the config value. -func (s *SetConfigPrm) SetValue(value interface{}) { - s.value = value -} - -// SetConfig sets config field. -func (w *Wrapper) SetConfig(prm SetConfigPrm) error { - args := netmap.SetConfigPrm{} - - args.SetID(prm.id) - args.SetKey(prm.key) - args.SetValue(prm.value) - args.InvokePrmOptional = prm.InvokePrmOptional - - return w.client.SetConfig(args) -} - -// IterateConfigParameters iterates over configuration parameters stored in Netmap contract and passes them to f. -// -// Returns f's errors directly. -func (w *Wrapper) IterateConfigParameters(f func(key, value []byte) error) error { - var args netmap.ListConfigArgs - - v, err := w.client.ListConfig(args) - if err != nil { - return fmt.Errorf("client error: %w", err) - } - - return v.IterateRecords(func(key, value []byte) error { - return f(key, value) - }) -} - -// ConfigWriter is an interface of NeoFS network config writer. -type ConfigWriter interface { - UnknownParameter(string, []byte) - MaxObjectSize(uint64) - BasicIncomeRate(uint64) - AuditFee(uint64) - EpochDuration(uint64) - ContainerFee(uint64) - ContainerAliasFee(uint64) - EigenTrustIterations(uint64) - EigenTrustAlpha(float64) - InnerRingCandidateFee(uint64) - WithdrawFee(uint64) -} - -// WriteConfig writes NeoFS network configuration received via iterator. -// -// Returns iterator's errors directly. -func WriteConfig(dst ConfigWriter, iterator func(func(key, val []byte) error) error) error { - return iterator(func(key, val []byte) error { - switch k := string(key); k { - default: - dst.UnknownParameter(k, val) - case maxObjectSizeConfig: - dst.MaxObjectSize(bigint.FromBytes(val).Uint64()) - case basicIncomeRateConfig: - dst.BasicIncomeRate(bigint.FromBytes(val).Uint64()) - case auditFeeConfig: - dst.AuditFee(bigint.FromBytes(val).Uint64()) - case epochDurationConfig: - dst.EpochDuration(bigint.FromBytes(val).Uint64()) - case containerFeeConfig: - dst.ContainerFee(bigint.FromBytes(val).Uint64()) - case containerAliasFeeConfig: - dst.ContainerAliasFee(bigint.FromBytes(val).Uint64()) - case etIterationsConfig: - dst.EigenTrustIterations(bigint.FromBytes(val).Uint64()) - case etAlphaConfig: - v, err := strconv.ParseFloat(string(val), 64) - if err != nil { - return fmt.Errorf("prm %s: %v", etAlphaConfig, err) - } - - dst.EigenTrustAlpha(v) - case irCandidateFeeConfig: - dst.InnerRingCandidateFee(bigint.FromBytes(val).Uint64()) - case withdrawFeeConfig: - dst.WithdrawFee(bigint.FromBytes(val).Uint64()) - } - - return nil - }) -} diff --git a/pkg/morph/client/netmap/wrapper/epoch.go b/pkg/morph/client/netmap/wrapper/epoch.go deleted file mode 100644 index ba3ff0f3d5..0000000000 --- a/pkg/morph/client/netmap/wrapper/epoch.go +++ /dev/null @@ -1,33 +0,0 @@ -package wrapper - -import ( - "fmt" - - "github.com/nspcc-dev/neofs-node/pkg/morph/client/netmap" -) - -// Epoch receives number of current NeoFS epoch -// through the Netmap contract call. -func (w *Wrapper) Epoch() (uint64, error) { - args := netmap.EpochArgs{} - - vals, err := w.client.Epoch(args) - if err != nil { - return 0, fmt.Errorf("(%T) could not get epoch number: %w", w, err) - } - - return uint64(vals.Number()), nil -} - -// LastEpochBlock receives block number of current NeoFS epoch -// through the Netmap contract call. -func (w *Wrapper) LastEpochBlock() (uint32, error) { - args := netmap.EpochBlockArgs{} - - vals, err := w.client.LastEpochBlock(args) - if err != nil { - return 0, fmt.Errorf("(%T) could not get epoch block number: %w", w, err) - } - - return uint32(vals.Block()), nil -} diff --git a/pkg/morph/client/netmap/wrapper/innerring.go b/pkg/morph/client/netmap/wrapper/innerring.go deleted file mode 100644 index 394ff57c62..0000000000 --- a/pkg/morph/client/netmap/wrapper/innerring.go +++ /dev/null @@ -1,35 +0,0 @@ -package wrapper - -import ( - "github.com/nspcc-dev/neo-go/pkg/crypto/keys" - "github.com/nspcc-dev/neofs-node/pkg/morph/client" - "github.com/nspcc-dev/neofs-node/pkg/morph/client/netmap" -) - -// UpdateIRPrm groups parameters of UpdateInnerRing -// invocation. -type UpdateIRPrm struct { - keys keys.PublicKeys - - client.InvokePrmOptional -} - -// SetKeys sets new inner ring keys. -func (u *UpdateIRPrm) SetKeys(keys keys.PublicKeys) { - u.keys = keys -} - -// UpdateInnerRing updates inner ring keys. -func (w *Wrapper) UpdateInnerRing(prm UpdateIRPrm) error { - args := netmap.UpdateIRPrm{} - - args.SetKeys(prm.keys) - args.InvokePrmOptional = prm.InvokePrmOptional - - return w.client.UpdateInnerRing(args) -} - -// GetInnerRingList return current IR list. -func (w *Wrapper) GetInnerRingList() (keys.PublicKeys, error) { - return w.client.InnerRingList() -} diff --git a/pkg/morph/client/netmap/wrapper/netmap.go b/pkg/morph/client/netmap/wrapper/netmap.go deleted file mode 100644 index 8ca3b09f52..0000000000 --- a/pkg/morph/client/netmap/wrapper/netmap.go +++ /dev/null @@ -1,96 +0,0 @@ -package wrapper - -import ( - "fmt" - - client "github.com/nspcc-dev/neofs-node/pkg/morph/client/netmap" - "github.com/nspcc-dev/neofs-sdk-go/netmap" -) - -// GetNetMap receives information list about storage nodes -// through the Netmap contract call, composes network map -// from them and returns it. With diff == 0 returns current -// network map, else return snapshot of previous network map. -func (w Wrapper) GetNetMap(diff uint64) (*netmap.Netmap, error) { - args := client.GetSnapshotArgs{} - args.SetDiff(diff) - - vals, err := w.client.Snapshot(args) - if err != nil { - return nil, err - } - - return unmarshalNetmap(vals.Peers()) -} - -// GetNetMapByEpoch receives information list about storage nodes -// through the Netmap contract call, composes network map -// from them and returns it. Returns snapshot of the specified epoch number. -func (w Wrapper) GetNetMapByEpoch(epoch uint64) (*netmap.Netmap, error) { - args := client.EpochSnapshotArgs{} - args.SetEpoch(epoch) - - vals, err := w.client.EpochSnapshot(args) - if err != nil { - return nil, err - } - - return unmarshalNetmap(vals.Peers()) -} - -// GetCandidates receives information list about candidates -// for the next epoch network map through the Netmap contract -// call, composes network map from them and returns it. -func (w Wrapper) GetCandidates() (*netmap.Netmap, error) { - args := client.GetNetMapCandidatesArgs{} - - vals, err := w.client.Candidates(args) - if err != nil { - return nil, err - } - - return unmarshalCandidates(vals.NetmapNodes()) -} - -func unmarshalNetmap(rawPeers [][]byte) (*netmap.Netmap, error) { - infos := make([]netmap.NodeInfo, 0, len(rawPeers)) - - for _, peer := range rawPeers { - nodeInfo := netmap.NewNodeInfo() - if err := nodeInfo.Unmarshal(peer); err != nil { - return nil, fmt.Errorf("can't unmarshal peer info: %w", err) - } - - infos = append(infos, *nodeInfo) - } - - nodes := netmap.NodesFromInfo(infos) - - return netmap.NewNetmap(nodes) -} - -func unmarshalCandidates(rawCandidate []*client.PeerWithState) (*netmap.Netmap, error) { - candidates := make([]netmap.NodeInfo, 0, len(rawCandidate)) - - for _, candidate := range rawCandidate { - nodeInfo := netmap.NewNodeInfo() - if err := nodeInfo.Unmarshal(candidate.Peer()); err != nil { - return nil, fmt.Errorf("can't unmarshal peer info: %w", err) - } - - switch candidate.State() { - case client.Online: - nodeInfo.SetState(netmap.NodeStateOnline) - case client.Offline: - nodeInfo.SetState(netmap.NodeStateOffline) - default: - nodeInfo.SetState(0) - } - - candidates = append(candidates, *nodeInfo) - } - - nodes := netmap.NodesFromInfo(candidates) - - return netmap.NewNetmap(nodes) -} diff --git a/pkg/morph/client/netmap/wrapper/new_epoch.go b/pkg/morph/client/netmap/wrapper/new_epoch.go deleted file mode 100644 index bbe6201cf9..0000000000 --- a/pkg/morph/client/netmap/wrapper/new_epoch.go +++ /dev/null @@ -1,12 +0,0 @@ -package wrapper - -import "github.com/nspcc-dev/neofs-node/pkg/morph/client/netmap" - -// NewEpoch updates NeoFS epoch number through -// Netmap contract call. -func (w *Wrapper) NewEpoch(e uint64) error { - var args netmap.NewEpochArgs - args.SetEpochNumber(int64(e)) - - return w.client.NewEpoch(args) -} diff --git a/pkg/morph/client/netmap/wrapper/snapshot.go b/pkg/morph/client/netmap/wrapper/snapshot.go deleted file mode 100644 index f4fa97218d..0000000000 --- a/pkg/morph/client/netmap/wrapper/snapshot.go +++ /dev/null @@ -1,28 +0,0 @@ -package wrapper - -import ( - "fmt" - - netmap2 "github.com/nspcc-dev/neofs-node/pkg/morph/client/netmap" - "github.com/nspcc-dev/neofs-sdk-go/netmap" -) - -// Snapshot returns current netmap node infos. -// Consider using pkg/morph/client/netmap for this. -func (w *Wrapper) Snapshot() (*netmap.Netmap, error) { - res, err := w.client.Snapshot(netmap2.GetSnapshotArgs{}) - if err != nil { - return nil, err - } - - peers := res.Peers() - result := make([]netmap.NodeInfo, len(peers)) - - for i := range peers { - if err := result[i].Unmarshal(peers[i]); err != nil { - return nil, fmt.Errorf("can't unmarshal node info: %w", err) - } - } - - return netmap.NewNetmap(netmap.NodesFromInfo(result)) -} diff --git a/pkg/morph/client/netmap/wrapper/update_state.go b/pkg/morph/client/netmap/wrapper/update_state.go deleted file mode 100644 index 61208d1bc7..0000000000 --- a/pkg/morph/client/netmap/wrapper/update_state.go +++ /dev/null @@ -1,43 +0,0 @@ -package wrapper - -import ( - "fmt" - - "github.com/nspcc-dev/neofs-node/pkg/morph/client" - contract "github.com/nspcc-dev/neofs-node/pkg/morph/client/netmap" - "github.com/nspcc-dev/neofs-sdk-go/netmap" -) - -// UpdatePeerPrm groups parameters of UpdatePeerState operation. -type UpdatePeerPrm struct { - key []byte - state netmap.NodeState - - client.InvokePrmOptional -} - -// SetKey sets public key. -func (u *UpdatePeerPrm) SetKey(key []byte) { - u.key = key -} - -// SetState sets node state. -func (u *UpdatePeerPrm) SetState(state netmap.NodeState) { - u.state = state -} - -// UpdatePeerState changes peer status through Netmap contract -// call. -func (w *Wrapper) UpdatePeerState(prm UpdatePeerPrm) error { - args := contract.UpdateStateArgs{} - - args.SetPublicKey(prm.key) - args.SetState(int64(prm.state.ToV2())) - args.InvokePrmOptional = prm.InvokePrmOptional - - // invoke smart contract call - if err := w.client.UpdateState(args); err != nil { - return fmt.Errorf("could not invoke smart contract: %w", err) - } - return nil -} diff --git a/pkg/morph/client/netmap/wrapper/wrapper.go b/pkg/morph/client/netmap/wrapper/wrapper.go deleted file mode 100644 index 9ce777cb37..0000000000 --- a/pkg/morph/client/netmap/wrapper/wrapper.go +++ /dev/null @@ -1,79 +0,0 @@ -package wrapper - -import ( - "fmt" - - "github.com/nspcc-dev/neo-go/pkg/encoding/fixedn" - "github.com/nspcc-dev/neo-go/pkg/util" - "github.com/nspcc-dev/neofs-node/pkg/morph/client" - "github.com/nspcc-dev/neofs-node/pkg/morph/client/internal" - "github.com/nspcc-dev/neofs-node/pkg/morph/client/netmap" -) - -// Wrapper is a wrapper over netmap contract -// client which implements: -// * network map storage; -// * tool for peer state updating. -// -// Working wrapper must be created via constructor New. -// Using the Wrapper that has been created with new(Wrapper) -// expression (or just declaring a Wrapper variable) is unsafe -// and can lead to panic. -type Wrapper struct { - internal.StaticClient - - client *netmap.Client -} - -// Option allows to set an optional -// parameter of Wrapper. -type Option func(*opts) - -type opts []client.StaticClientOption - -func defaultOpts() *opts { - return new(opts) -} - -// NewFromMorph returns the wrapper instance from the raw morph client. -func NewFromMorph(cli *client.Client, contract util.Uint160, fee fixedn.Fixed8, opts ...Option) (*Wrapper, error) { - o := defaultOpts() - - for i := range opts { - opts[i](o) - } - - staticClient, err := client.NewStatic(cli, contract, fee, ([]client.StaticClientOption)(*o)...) - if err != nil { - return nil, fmt.Errorf("can't create netmap static client: %w", err) - } - - return &Wrapper{ - StaticClient: staticClient, - client: netmap.New(staticClient), - }, nil -} - -// Morph returns raw morph client. -func (w Wrapper) Morph() *client.Client { - return w.client.Morph() -} - -// 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 -// of notary requests with client's private -// key. -// -// Considered to be used by IR nodes only. -func AsAlphabet() Option { - return func(o *opts) { - *o = append(*o, client.AsAlphabet()) - } -}