aarifullin/frostfs-node
1
0
Fork 0
forked from TrueCloudLab/frostfs-node
Code Issues Pull requests Projects Releases Packages Wiki Activity

[#684] neofs-adm: add labels to multisig accounts

Browse source 
Also check that correct multisig is generated.

Signed-off-by: Evgenii Stratonikov <evgeniy@nspcc.ru>
This commit is contained in:
Evgenii Stratonikov 2021-07-17 16:00:22 +03:00 committed by Alex Vanin
parent be6b8ca179
commit a2cb9cbc49
2 changed files with 20 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
cmd/neofs-adm/internal/modules/morph/generate.go
View file

@ -14,6 +14,12 @@ import (
"github.com/spf13/viper"
)
const (
singleAccountName = "single"
committeeAccountName = "committee"
consensusAccountName = "consensus"
)
func generateAlphabetCreds(cmd *cobra.Command, args []string) error {
// alphabet size is not part of the config
size, err := cmd.Flags().GetUint(alphabetSizeFlag)
@ -56,7 +62,7 @@ func initializeWallets(walletDir string, size int) ([]string, error) {
if err != nil {
return nil, fmt.Errorf("can't create wallet: %w", err)
}
if err := w.CreateAccount("single", password); err != nil {
if err := w.CreateAccount(singleAccountName, password); err != nil {
return nil, fmt.Errorf("can't create account: %w", err)
}
@ -68,7 +74,7 @@ func initializeWallets(walletDir string, size int) ([]string, error) {
// Create committee account with N/2+1 multi-signature.
majCount := smartcontract.GetMajorityHonestNodeCount(size)
for i, w := range wallets {
if err := addMultisigAccount(w, majCount, passwords[i], pubs); err != nil {
if err := addMultisigAccount(w, majCount, committeeAccountName, passwords[i], pubs); err != nil {
return nil, fmt.Errorf("can't create committee account: %w", err)
}
}
@ -76,7 +82,7 @@ func initializeWallets(walletDir string, size int) ([]string, error) {
// Create consensus account with 2*N/3+1 multi-signature.
bftCount := smartcontract.GetDefaultHonestNodeCount(size)
for i, w := range wallets {
if err := addMultisigAccount(w, bftCount, passwords[i], pubs); err != nil {
if err := addMultisigAccount(w, bftCount, consensusAccountName, passwords[i], pubs); err != nil {
return nil, fmt.Errorf("can't create consensus account: %w", err)
}
}
@ -91,8 +97,10 @@ func initializeWallets(walletDir string, size int) ([]string, error) {
return passwords, nil
}
func addMultisigAccount(w *wallet.Wallet, m int, password string, pubs keys.PublicKeys) error {
func addMultisigAccount(w *wallet.Wallet, m int, name, password string, pubs keys.PublicKeys) error {
acc := wallet.NewAccountFromPrivateKey(w.Accounts[0].PrivateKey())
acc.Label = name
if err := acc.ConvertMultisig(m, pubs); err != nil {
return err
}

8
cmd/neofs-adm/internal/modules/morph/generate_test.go
View file

@ -66,6 +66,14 @@ func TestGenerateAlphabet(t *testing.T) {
for _, a := range w.Accounts {
err := a.Decrypt(strconv.FormatUint(i, 10), keys.NEP2ScryptParams())
require.NoError(t, err, "can't decrypt account")
switch a.Label {
case consensusAccountName:
require.Equal(t, size/2+1, len(a.Contract.Parameters))
case committeeAccountName:
require.Equal(t, size*2/3+1, len(a.Contract.Parameters))
default:
require.Equal(t, singleAccountName, a.Label)
}
}
}
}