sn/container: Try new createV2 method for contract creation

Will become available with nspcc-dev/neofs-contract#534
upgrade. If new method is missing, SN falls back to old methods.

Signed-off-by: Leonard Lyubich <leonard@morphbits.io>

Author: cthulhu-rider

CHANGELOG.md

@@ -8,7 +8,7 @@ Changelog for NeoFS Node
 - IR `experimental.allow_ec` config option (#3570)
 - SN `pprof.enable_block` and `pprof.enable_mutex` options (#3655)
 - `neofs-adm fschain load-report` command (#3649)
-- SN now supports new `getInfo` method of the Container contract (#3670)
+- SN now supports new `getInfo` and `createV2` methods of the Container contract (#3670)
 
 ### Fixed
 - Write cache using too much CPU (#3642)

pkg/morph/client/container/put.go

@@ -50,21 +50,32 @@ func (c *Client) Put(p PutPrm) (cid.ID, error) {
 	}
 
 	var prm client.InvokePrm
-	prm.SetMethod(fschaincontracts.CreateContainerMethod)
+	prm.SetMethod(fschaincontracts.CreateContainerV2Method)
 	prm.InvokePrmOptional = p.InvokePrmOptional
-
-	domain := p.cnr.ReadDomain()
-	metaAttr := p.cnr.Attribute("__NEOFS__METAINFO_CONSISTENCY")
-	metaEnabled := metaAttr == "optimistic" || metaAttr == "strict"
-	cnrBytes := p.cnr.Marshal()
-	prm.SetArgs(cnrBytes, p.sig, p.key, p.token, domain.Name(), domain.Zone(), metaEnabled)
+	prm.SetArgs(fschaincontracts.ContainerToStackItem(p.cnr), p.sig, p.key, p.token)
 
 	// no magic bugs with notary requests anymore, this operation should
 	// _always_ be notary signed so make it one more time even if it is
 	// a repeated flag setting
 	prm.RequireAlphabetSignature()
 
 	err := c.client.Invoke(prm)
+	if err == nil {
+		return cid.NewFromMarshalledContainer(p.cnr.Marshal()), nil
+	}
+	if !isMethodNotFoundError(err, fschaincontracts.CreateContainerV2Method) {
+		return cid.ID{}, fmt.Errorf("could not invoke method (%s): %w", fschaincontracts.CreateContainerV2Method, err)
+	}
+
+	prm.SetMethod(fschaincontracts.CreateContainerMethod)
+
+	domain := p.cnr.ReadDomain()
+	metaAttr := p.cnr.Attribute("__NEOFS__METAINFO_CONSISTENCY")
+	metaEnabled := metaAttr == "optimistic" || metaAttr == "strict"
+	cnrBytes := p.cnr.Marshal()
+	prm.SetArgs(cnrBytes, p.sig, p.key, p.token, domain.Name(), domain.Zone(), metaEnabled)
+
+	err = c.client.Invoke(prm)
 	if err != nil {
 		if isMethodNotFoundError(err, fschaincontracts.CreateContainerMethod) {
 			prm.SetMethod(putMethod)

pkg/morph/contracts/methods.go

@@ -3,6 +3,7 @@ package fschaincontracts
 // Various methods of FS chain Container contract.
 const (
 	CreateContainerMethod         = "create"
+	CreateContainerV2Method       = "createV2"
 	RemoveContainerMethod         = "remove"
 	PutContainerEACLMethod        = "putEACL"
 	PutContainerReportMethod      = "putReport"

pkg/morph/contracts/models.go

@@ -3,6 +3,7 @@ package fschaincontracts
 import (
 	"errors"
 	"fmt"
+	"math/big"
 
 	"github.com/nspcc-dev/neo-go/pkg/vm/stackitem"
 	containerrpc "github.com/nspcc-dev/neofs-contract/rpc/container"
@@ -86,3 +87,26 @@ func containerVersionFromStruct(src *containerrpc.ContainerAPIVersion) (uint32,
 
 	return mjr, mnr, nil
 }
+
+// ContainerToStackItem encodes container to instance convertible to stack item.
+func ContainerToStackItem(cnr container.Container) stackitem.Convertible {
+	ver := cnr.Version()
+	owner := cnr.Owner()
+
+	var attrs []*containerrpc.ContainerAttribute
+	for k, v := range cnr.Attributes() {
+		attrs = append(attrs, &containerrpc.ContainerAttribute{Key: k, Value: v})
+	}
+
+	return &containerrpc.ContainerInfo{
+		Version: &containerrpc.ContainerAPIVersion{
+			Major: big.NewInt(int64(ver.Major())),
+			Minor: big.NewInt(int64(ver.Minor())),
+		},
+		Owner:         owner.ScriptHash(),
+		Nonce:         cnr.ProtoMessage().Nonce, // TODO: provide and use nonce getter
+		BasicACL:      big.NewInt(int64(cnr.BasicACL().Bits())),
+		Attributes:    attrs,
+		StoragePolicy: cnr.PlacementPolicy().Marshal(),
+	}
+}