[#562] cmd/neofs-node: use NEP-6 wallet for keys

Also use neo-go private key wrapper where possible, as it
already has methods for (un)marshaling.

Signed-off-by: Evgenii Stratonikov <evgeniy@nspcc.ru>

cmd/neofs-node/config/control/config.go

@@ -1,6 +1,9 @@
 package controlconfig
 
 import (
+	"fmt"
+
+	"github.com/nspcc-dev/neo-go/pkg/crypto/keys"
 	"github.com/nspcc-dev/neofs-node/cmd/neofs-node/config"
 )
 
@@ -18,12 +21,24 @@ const (
 	GRPCEndpointDefault = ""
 )
 
-// AuthorizedKeysString returns string array of "authorized_keys" config
+// AuthorizedKeys parses and returns array of "authorized_keys" config
 // parameter from "control" section.
 //
 // Returns empty list if not set.
-func AuthorizedKeysString(c *config.Config) []string {
-	return config.StringSliceSafe(c.Sub(subsection), "authorized_keys")
+func AuthorizedKeys(c *config.Config) keys.PublicKeys {
+	strKeys := config.StringSliceSafe(c.Sub(subsection), "authorized_keys")
+	pubs := make(keys.PublicKeys, 0, len(strKeys))
+
+	for i := range strKeys {
+		pub, err := keys.NewPublicKeyFromString(strKeys[i])
+		if err != nil {
+			panic(fmt.Errorf("invalid permitted key for Control service %s: %w", strKeys[i], err))
+		}
+
+		pubs = append(pubs, pub)
+	}
+
+	return pubs
 }
 
 // GRPC returns structure that provides access to "grpc" subsection of

cmd/neofs-node/config/control/config_test.go

@@ -3,6 +3,7 @@ package controlconfig_test
 import (
 	"testing"
 
+	"github.com/nspcc-dev/neo-go/pkg/crypto/keys"
 	"github.com/nspcc-dev/neofs-node/cmd/neofs-node/config"
 	controlconfig "github.com/nspcc-dev/neofs-node/cmd/neofs-node/config/control"
 	configtest "github.com/nspcc-dev/neofs-node/cmd/neofs-node/config/test"
@@ -13,19 +14,18 @@ func TestControlSection(t *testing.T) {
 	t.Run("defaults", func(t *testing.T) {
 		empty := configtest.EmptyConfig()
 
-		require.Empty(t, controlconfig.AuthorizedKeysString(empty))
+		require.Empty(t, controlconfig.AuthorizedKeys(empty))
 		require.Equal(t, controlconfig.GRPCEndpointDefault, controlconfig.GRPC(empty).Endpoint())
 	})
 
 	const path = "../../../../config/example/node"
 
-	var keys = []string{
-		"035839e45d472a3b7769a2a1bd7d54c4ccd4943c3b40f547870e83a8fcbfb3ce11",
-		"028f42cfcb74499d7b15b35d9bff260a1c8d27de4f446a627406a382d8961486d6",
-	}
+	pubs := make(keys.PublicKeys, 2)
+	pubs[0], _ = keys.NewPublicKeyFromString("035839e45d472a3b7769a2a1bd7d54c4ccd4943c3b40f547870e83a8fcbfb3ce11")
+	pubs[1], _ = keys.NewPublicKeyFromString("028f42cfcb74499d7b15b35d9bff260a1c8d27de4f446a627406a382d8961486d6")
 
 	var fileConfigTest = func(c *config.Config) {
-		require.Equal(t, keys, controlconfig.AuthorizedKeysString(c))
+		require.Equal(t, pubs, controlconfig.AuthorizedKeys(c))
 		require.Equal(t, "127.0.0.1:8090", controlconfig.GRPC(c).Endpoint())
 	}
 

cmd/neofs-node/config/node/config.go

@@ -5,8 +5,10 @@ import (
 	"fmt"
 	"strconv"
 
+	"github.com/nspcc-dev/neo-go/pkg/crypto/keys"
 	"github.com/nspcc-dev/neofs-node/cmd/neofs-node/config"
 	"github.com/nspcc-dev/neofs-node/pkg/network"
+	utilConfig "github.com/nspcc-dev/neofs-node/pkg/util/config"
 )
 
 const (
@@ -36,6 +38,20 @@ func Key(c *config.Config) string {
 	return v
 }
 
+// Wallet returns value of node private key from "node" section.
+func Wallet(c *config.Config) *keys.PrivateKey {
+	v := c.Sub(subsection).Sub("wallet")
+	acc, err := utilConfig.LoadAccount(
+		config.String(v, "path"),
+		config.String(v, "address"),
+		config.String(v, "password"))
+	if err != nil {
+		panic(fmt.Errorf("invalid wallet config: %w", err))
+	}
+
+	return acc.PrivateKey()
+}
+
 // BootstrapAddress returns value of "address" config parameter
 // from "node" section as network.Address.
 //

cmd/neofs-node/config/node/config_test.go

@@ -3,6 +3,7 @@ package nodeconfig
 import (
 	"testing"
 
+	"github.com/nspcc-dev/neo-go/pkg/encoding/address"
 	"github.com/nspcc-dev/neofs-node/cmd/neofs-node/config"
 	configtest "github.com/nspcc-dev/neofs-node/cmd/neofs-node/config/test"
 	"github.com/nspcc-dev/neofs-node/pkg/network"
@@ -43,6 +44,7 @@ func TestNodeSection(t *testing.T) {
 		addr := BootstrapAddress(c)
 		attributes := Attributes(c)
 		relay := Relay(c)
+		wKey := Wallet(c)
 
 		expectedAddr, err := network.AddressFromString("s01.neofs.devenv:8080")
 		require.NoError(t, err)
@@ -54,6 +56,11 @@ func TestNodeSection(t *testing.T) {
 		require.Len(t, attributes, 2)
 		require.Equal(t, "Price:11", attributes[0])
 		require.Equal(t, "UN-LOCODE:RU MSK", attributes[1])
+
+		require.NotNil(t, wKey)
+		require.Equal(t,
+			config.StringSafe(c.Sub("node").Sub("wallet"), "address"),
+			address.Uint160ToString(wKey.GetScriptHash()))
 	}
 
 	configtest.ForEachFileType(path, fileConfigTest)

cmd/neofs-node/config/node/wallet.json

@@ -0,0 +1,30 @@
+{
+  "version": "3.0",
+  "accounts": [
+    {
+      "address": "NcpJzXcSDrh5CCizf4K9Ro6w4t59J5LKzz",
+      "key": "6PYXFRFUfoMNjWd2UmaaEjwHSWpifcLLTbEfhkwXdiSZ2n2WLfr75JpxmJ",
+      "label": "testacc",
+      "contract": {
+        "script": "DCECaeaVhKFa+ENNUpRJLz6BRmRbkIaoN+xZt3VHzlzkHJZBVuezJw==",
+        "parameters": [
+          {
+            "name": "parameter0",
+            "type": "Signature"
+          }
+        ],
+        "deployed": false
+      },
+      "lock": false,
+      "isDefault": false
+    }
+  ],
+  "scrypt": {
+    "n": 16384,
+    "r": 8,
+    "p": 8
+  },
+  "extra": {
+    "Tokens": null
+  }
+}