TrueCloudLab
/
frostfs-node
18
1
Fork 20
Code Issues 88 Pull Requests 7 Actions Releases Activity

[#834] neofs-adm: Use committee signature when updating alphabet contract 

Signed-off-by: Alex Vanin <alexey@nspcc.ru>
remotes/fyrchik/meta-pebble
Alex Vanin 2021-09-21 15:19:22 +03:00 committed by Alex Vanin
parent 6b3a9e6fcc
commit d996004d80
1 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
cmd/neofs-adm/internal/modules/morph/initialize_deploy.go
View File

@ -158,6 +158,13 @@ func (c *initializeContext) deployContracts(method string) error {
Account: acc.Contract.ScriptHash(),
Scopes: transaction.CalledByEntry,
}
if method == "migrate" {
signer = transaction.Signer{
Account: c.CommitteeAcc.Contract.ScriptHash(),
Scopes: transaction.CalledByEntry,
}
}
res, err := c.Client.InvokeFunction(invokeHash, method, params, []transaction.Signer{signer})
if err != nil {
return fmt.Errorf("can't deploy alphabet #%d contract: %w", i, err)
@ -166,15 +173,21 @@ func (c *initializeContext) deployContracts(method string) error {
return fmt.Errorf("can't deploy alpabet #%d contract: %s", i, res.FaultException)
}
h, err := c.Client.SignAndPushInvocationTx(res.Script, acc, -1, 0, []client.SignerAccount{{
Signer: signer,
Account: acc,
}})
if err != nil {
return fmt.Errorf("can't push deploy transaction: %w", err)
}
if method == "migrate" {
if err := c.sendCommitteeTx(res.Script, res.GasConsumed); err != nil {
return err
}
} else {
h, err := c.Client.SignAndPushInvocationTx(res.Script, acc, -1, 0, []client.SignerAccount{{
Signer: signer,
Account: acc,
}})
if err != nil {
return fmt.Errorf("can't push deploy transaction: %w", err)
}
c.Hashes = append(c.Hashes, h)
c.Hashes = append(c.Hashes, h)
}
}
for _, ctrName := range contractList {