From c332188341ef7f3e3698dcd68deb1f5bae627a38 Mon Sep 17 00:00:00 2001 From: Evgenii Stratonikov Date: Mon, 26 Jul 2021 11:01:53 +0300 Subject: [PATCH] [#685] neofs-adm: generate storage node wallets Initial GAS can be provided both in config and as a CLI argument. Generating wallet with 0 GAS is currently prohibited. Signed-off-by: Evgenii Stratonikov --- .../internal/modules/morph/generate.go | 61 +++++++++++++++++-- cmd/neofs-adm/internal/modules/morph/root.go | 4 ++ 2 files changed, 61 insertions(+), 4 deletions(-) diff --git a/cmd/neofs-adm/internal/modules/morph/generate.go b/cmd/neofs-adm/internal/modules/morph/generate.go index 09b5d2551..3c0d28312 100644 --- a/cmd/neofs-adm/internal/modules/morph/generate.go +++ b/cmd/neofs-adm/internal/modules/morph/generate.go @@ -5,8 +5,14 @@ import ( "fmt" "path" + "github.com/nspcc-dev/neo-go/cli/input" + "github.com/nspcc-dev/neo-go/pkg/core/native/nativenames" "github.com/nspcc-dev/neo-go/pkg/crypto/keys" + "github.com/nspcc-dev/neo-go/pkg/encoding/fixedn" + "github.com/nspcc-dev/neo-go/pkg/io" "github.com/nspcc-dev/neo-go/pkg/smartcontract" + "github.com/nspcc-dev/neo-go/pkg/smartcontract/callflag" + "github.com/nspcc-dev/neo-go/pkg/vm/emit" "github.com/nspcc-dev/neo-go/pkg/wallet" "github.com/nspcc-dev/neofs-node/cmd/neofs-adm/internal/modules/config" "github.com/nspcc-dev/neofs-node/pkg/innerring" @@ -117,10 +123,57 @@ func generateStorageCreds(cmd *cobra.Command, args []string) error { if err != nil { return err } + if storageWalletPath == "" { + return fmt.Errorf("missing wallet path (use '--%s ')", storageWalletFlag) + } - cmd.Println("endpoint:", viper.GetString(endpointFlag)) - cmd.Println("alphabet-wallets:", viper.GetString(alphabetWalletsFlag)) - cmd.Println("storage-wallet:", storageWalletPath) + w, err := wallet.NewWallet(storageWalletPath) + if err != nil { + return fmt.Errorf("can't create wallet: %w", err) + } - return nil + password, err := input.ReadPassword("New password > ") + if err != nil { + return fmt.Errorf("can't fetch password: %w", err) + } + + if err := w.CreateAccount(singleAccountName, password); err != nil { + return fmt.Errorf("can't create account: %w", err) + } + + gasStr := viper.GetString(storageGasConfigFlag) + if gasStr == "" { + return nil + } + + gasAmount, err := fixedn.Fixed8FromString(gasStr) + if err != nil { + return fmt.Errorf("invalid GAS amount %s: %w", gasStr, err) + } + if gasAmount <= 0 { + return fmt.Errorf("GAS amount must be positive (got %d)", gasAmount) + } + + wCtx, err := newInitializeContext(cmd, viper.GetViper()) + if err != nil { + return err + } + + gasHash, err := wCtx.Client.GetNativeContractHash(nativenames.Gas) + if err != nil { + return err + } + + bw := io.NewBufBinWriter() + emit.AppCall(bw.BinWriter, gasHash, "transfer", callflag.All, + wCtx.CommitteeAcc.Contract.ScriptHash(), w.Accounts[0].Contract.ScriptHash(), int64(gasAmount), nil) + if bw.Err != nil { + return fmt.Errorf("BUG: invalid transfer arguments: %w", bw.Err) + } + + if err := wCtx.sendCommitteeTx(bw.Bytes(), -1); err != nil { + return err + } + + return wCtx.awaitTx() } diff --git a/cmd/neofs-adm/internal/modules/morph/root.go b/cmd/neofs-adm/internal/modules/morph/root.go index 4fbdc3bda..d91fc7ac6 100644 --- a/cmd/neofs-adm/internal/modules/morph/root.go +++ b/cmd/neofs-adm/internal/modules/morph/root.go @@ -10,6 +10,8 @@ const ( alphabetSizeFlag = "size" endpointFlag = "rpc-endpoint" storageWalletFlag = "storage-wallet" + storageGasCLIFlag = "initial-gas" + storageGasConfigFlag = "storage.initial_gas" contractsInitFlag = "contracts" maxObjectSizeInitFlag = "network.max_object_size" maxObjectSizeCLIFlag = "max-object-size" @@ -52,6 +54,7 @@ var ( PreRun: func(cmd *cobra.Command, _ []string) { _ = viper.BindPFlag(alphabetWalletsFlag, cmd.Flags().Lookup(alphabetWalletsFlag)) _ = viper.BindPFlag(endpointFlag, cmd.Flags().Lookup(endpointFlag)) + _ = viper.BindPFlag(storageGasConfigFlag, cmd.Flags().Lookup(storageGasCLIFlag)) }, RunE: generateStorageCreds, } @@ -92,6 +95,7 @@ func init() { generateStorageCmd.Flags().String(alphabetWalletsFlag, "", "path to alphabet wallets dir") generateStorageCmd.Flags().StringP(endpointFlag, "r", "", "N3 RPC node endpoint") generateStorageCmd.Flags().String(storageWalletFlag, "", "path to new storage node wallet") + generateStorageCmd.Flags().String(storageGasCLIFlag, "", "initial amount of GAS to transfer") RootCmd.AddCommand(forceNewEpoch) forceNewEpoch.Flags().String(alphabetWalletsFlag, "", "path to alphabet wallets dir")