Update neofs-contract to v0.20.0

CHANGELOG.md

@@ -6,6 +6,7 @@ Changelog for NeoFS Node
 ### Added
 - Indexes inspection command to neofs-lens (#2882)
 - Add objects sanity checker to neofs-lens (#2506)
+- Support for 0.20.0+ neofs-contract archive format (#2872)
 
 ### Fixed
 - Control service's Drop call does not clean metabase (#2822)
@@ -20,6 +21,8 @@ Changelog for NeoFS Node
 ### Removed
 
 ### Updated
+- neofs-contract dependency to 0.20.0 (#2872)
+- NeoGo dependency to 0.106.3 (#2872)
 
 ### Updating from v0.42.1
 

cmd/neofs-adm/internal/modules/morph/initialize_deploy.go

@@ -4,6 +4,7 @@
 	"archive/tar"
 	"compress/gzip"
 	"encoding/json"
+	"errors"
 	"fmt"
 	"io"
 	"os"
@@ -372,11 +373,23 @@
 func readContract(ctrPath, ctrName string) (*contractState, error) {
 	rawNef, err := os.ReadFile(filepath.Join(ctrPath, ctrName+"_contract.nef"))
 	if err != nil {
-		return nil, fmt.Errorf("can't read NEF file for %s contract: %w", ctrName, err)
+		if !errors.Is(err, os.ErrNotExist) {
+			return nil, fmt.Errorf("can't read NEF file for %s contract: %w", ctrName, err)
+		}
+		rawNef, err = os.ReadFile(filepath.Join(ctrPath, "contract.nef"))
+		if err != nil {
+			return nil, fmt.Errorf("can't read NEF file for %s contract: %w", ctrName, err)
+		}
 	}
 	rawManif, err := os.ReadFile(filepath.Join(ctrPath, "config.json"))
 	if err != nil {
-		return nil, fmt.Errorf("can't read manifest file for %s contract: %w", ctrName, err)
+		if !errors.Is(err, os.ErrNotExist) {
+			return nil, fmt.Errorf("can't read manifest file for %s contract: %w", ctrName, err)
+		}
+		rawManif, err = os.ReadFile(filepath.Join(ctrPath, "manifest.json"))
+		if err != nil {
+			return nil, fmt.Errorf("can't read manifest file for %s contract: %w", ctrName, err)
+		}
 	}
 
 	cs := &contractState{
@@ -429,12 +442,13 @@
 		}
 
 		switch {
-		case strings.HasSuffix(h.Name, filepath.Join(ctrName, ctrName+"_contract.nef")):
+		case strings.HasSuffix(h.Name, "contract.nef"):
 			cs.RawNEF, err = io.ReadAll(r)
 			if err != nil {
 				return nil, fmt.Errorf("can't read NEF file for %s contract: %w", ctrName, err)
 			}
-		case strings.HasSuffix(h.Name, "config.json"):
+		case strings.HasSuffix(h.Name, "config.json") ||
+			strings.HasSuffix(h.Name, "manifest.json"):
 			cs.RawManifest, err = io.ReadAll(r)
 			if err != nil {
 				return nil, fmt.Errorf("can't read manifest file for %s contract: %w", ctrName, err)

cmd/neofs-adm/internal/modules/morph/remove_node.go

@@ -8,7 +8,7 @@
 	"github.com/nspcc-dev/neo-go/pkg/io"
 	"github.com/nspcc-dev/neo-go/pkg/smartcontract/callflag"
 	"github.com/nspcc-dev/neo-go/pkg/vm/emit"
-	netmapcontract "github.com/nspcc-dev/neofs-contract/contracts/netmap"
+	"github.com/nspcc-dev/neofs-contract/rpc/netmap"
 	"github.com/nspcc-dev/neofs-contract/rpc/nns"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
@@ -47,7 +47,7 @@
 	bw := io.NewBufBinWriter()
 	for i := range nodeKeys {
 		emit.AppCall(bw.BinWriter, nmHash, "updateStateIR", callflag.All,
-			int64(netmapcontract.NodeStateOffline), nodeKeys[i].Bytes())
+			netmap.NodeStateOffline, nodeKeys[i].Bytes())
 	}
 
 	if err := emitNewEpochCall(bw, wCtx, nmHash); err != nil {

cmd/neofs-node/container.go

@@ -11,7 +11,7 @@
 
 	containerV2 "github.com/nspcc-dev/neofs-api-go/v2/container"
 	containerGRPC "github.com/nspcc-dev/neofs-api-go/v2/container/grpc"
-	containercontract "github.com/nspcc-dev/neofs-contract/contracts/container"
+	containerrpc "github.com/nspcc-dev/neofs-contract/rpc/container"
 	"github.com/nspcc-dev/neofs-node/pkg/core/client"
 	containerCore "github.com/nspcc-dev/neofs-node/pkg/core/container"
 	netmapCore "github.com/nspcc-dev/neofs-node/pkg/core/netmap"
@@ -133,7 +133,7 @@
 		key:            pubKey,
 	}
 
-	loadAccumulator := loadstorage.New(containercontract.CleanupDelta)
+	loadAccumulator := loadstorage.New(containerrpc.CleanupDelta)
 
 	addNewEpochAsyncNotificationHandler(c, func(e event.Event) {
 		ev := e.(netmapEv.NewEpoch)