diff --git a/CHANGELOG.md b/CHANGELOG.md index fcbfeb0b4e..59827f345e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ Changelog for NeoFS Node ### Changed - Created files are not group writable (#2589) +- IR does not create new notary requests for the SN's bootstraps but signs the received ones instead (#2717) ### Removed - Deprecated `neofs-adm [...] inspect` commands (#2603) diff --git a/pkg/innerring/processors/netmap/process_peers.go b/pkg/innerring/processors/netmap/process_peers.go index 2d809711c4..4d3cf16b0b 100644 --- a/pkg/innerring/processors/netmap/process_peers.go +++ b/pkg/innerring/processors/netmap/process_peers.go @@ -3,7 +3,6 @@ package netmap import ( "encoding/hex" - netmapclient "github.com/nspcc-dev/neofs-node/pkg/morph/client/netmap" netmapEvent "github.com/nspcc-dev/neofs-node/pkg/morph/event/netmap" "github.com/nspcc-dev/neofs-sdk-go/netmap" "go.uber.org/zap" @@ -62,26 +61,9 @@ func (np *Processor) processAddPeer(ev netmapEvent.AddPeer) { np.log.Info("approving network map candidate", zap.String("key", keyString)) - prm := netmapclient.AddPeerPrm{} - prm.SetNodeInfo(nodeInfo) - - // In notary environments we call AddPeerIR method instead of AddPeer. - // It differs from AddPeer only by name, so we can do this in the same form. - // See https://github.com/nspcc-dev/neofs-contract/issues/154. - const methodAddPeerNotary = "addPeerIR" - - // create new notary request with the original nonce - err = np.netmapClient.Morph().NotaryInvoke( - np.netmapClient.ContractAddress(), - 0, - originalRequest.MainTransaction.Nonce, - nil, - methodAddPeerNotary, - nodeInfoBinary, - ) - + err = np.netmapClient.Morph().NotarySignAndInvokeTX(tx) if err != nil { - np.log.Error("can't invoke netmap.AddPeer", zap.Error(err)) + np.log.Error("can't sign and send notary request calling netmap.AddPeer", zap.Error(err)) } } }