innerring: use contracts from neofs-contract repository

Now updating neofs-contract dependency will automatically update contracts, see nspcc-dev/neofs-contract#384 This also updates contracts dependency to 0.20.0 adjusting the code where neccessary. Signed-off-by: Roman Khimov <[email protected]>
nspcc-dev · Jul 30, 2024 · 13010e8 · 13010e8
1 parent 065406b
commit 13010e8
Show file tree

Hide file tree

Showing 31 changed files with 59 additions and 371 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -21,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
 

diff --git a/cmd/neofs-adm/internal/modules/morph/remove_node.go b/cmd/neofs-adm/internal/modules/morph/remove_node.go
@@ -8,7 +8,7 @@ import (
 	"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 @@ func removeNodesCmd(cmd *cobra.Command, args []string) error {
 	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 {

diff --git a/cmd/neofs-node/container.go b/cmd/neofs-node/container.go
@@ -11,7 +11,7 @@ import (
 
 	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 @@ func initContainerService(c *cfg) {
 		key:            pubKey,
 	}
 
-	loadAccumulator := loadstorage.New(containercontract.CleanupDelta)
+	loadAccumulator := loadstorage.New(containerrpc.CleanupDelta)
 
 	addNewEpochAsyncNotificationHandler(c, func(e event.Event) {
 		ev := e.(netmapEv.NewEpoch)

diff --git a/contracts/00-nns.manifest.json b/contracts/00-nns.manifest.json
diff --git a/contracts/00-nns.nef b/contracts/00-nns.nef
diff --git a/contracts/01-proxy.manifest.json b/contracts/01-proxy.manifest.json
diff --git a/contracts/01-proxy.nef b/contracts/01-proxy.nef
diff --git a/contracts/02-audit.manifest.json b/contracts/02-audit.manifest.json
diff --git a/contracts/02-audit.nef b/contracts/02-audit.nef
diff --git a/contracts/03-netmap.manifest.json b/contracts/03-netmap.manifest.json
diff --git a/contracts/03-netmap.nef b/contracts/03-netmap.nef
diff --git a/contracts/04-balance.manifest.json b/contracts/04-balance.manifest.json
diff --git a/contracts/04-balance.nef b/contracts/04-balance.nef
diff --git a/contracts/05-reputation.manifest.json b/contracts/05-reputation.manifest.json
diff --git a/contracts/05-reputation.nef b/contracts/05-reputation.nef
diff --git a/contracts/06-neofsid.manifest.json b/contracts/06-neofsid.manifest.json
diff --git a/contracts/06-neofsid.nef b/contracts/06-neofsid.nef