TrueCloudLab/frostfs-node
19
1
Fork 27
Code Issues 91 Pull requests 8 Projects Releases 1 Activity Actions

[#421] morph/client: Support committee notary invoke

Browse source 
Committee invocations use other M/N parameters of multi signature
signer address. For committee M = N/2 + 1

Signed-off-by: Alex Vanin <alexey@nspcc.ru>
This commit is contained in:
Alex Vanin 2021-03-09 16:24:56 +03:00 committed by Alex Vanin
parent 527daec69a
commit 65c04284e7
1 changed files with 24 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
pkg/morph/client/notary.go
View file

@ -157,6 +157,14 @@ func (c *Client) GetNotaryDeposit() (int64, error) {
// //
// Supported args types: int64, string, util.Uint160, []byte and bool. // Supported args types: int64, string, util.Uint160, []byte and bool.
func (c *Client) NotaryInvoke(contract util.Uint160, method string, args ...interface{}) error { func (c *Client) NotaryInvoke(contract util.Uint160, method string, args ...interface{}) error {
return c.notaryInvoke(false, contract, method, args...)
}
func (c *Client) notaryInvokeAsCommittee(contract util.Uint160, method string, args ...interface{}) error {
return c.notaryInvoke(true, contract, method, args...)
}
func (c *Client) notaryInvoke(committee bool, contract util.Uint160, method string, args ...interface{}) error {
if c.notary == nil { if c.notary == nil {
return errNotaryNotEnabled return errNotaryNotEnabled
} }
@ -168,10 +176,10 @@ func (c *Client) NotaryInvoke(contract util.Uint160, method string, args ...inte
return err return err
} }
_, n := mn(irList) _, n := mn(irList, committee)
u8n := uint8(n) u8n := uint8(n)
cosigners, err := c.notaryCosigners(irList) cosigners, err := c.notaryCosigners(irList, committee)
if err != nil { if err != nil {
return err return err
} }
@ -194,7 +202,7 @@ func (c *Client) NotaryInvoke(contract util.Uint160, method string, args ...inte
// after test invocation we build main multisig transaction // after test invocation we build main multisig transaction
multiaddrAccount, err := c.notaryMultisigAccount(irList) multiaddrAccount, err := c.notaryMultisigAccount(irList, committee)
if err != nil { if err != nil {
return err return err
} }
@ -256,7 +264,7 @@ func (c *Client) NotaryInvoke(contract util.Uint160, method string, args ...inte
return nil return nil
} }
func (c *Client) notaryCosigners(ir []*keys.PublicKey) ([]transaction.Signer, error) { func (c *Client) notaryCosigners(ir []*keys.PublicKey, committee bool) ([]transaction.Signer, error) {
s := make([]transaction.Signer, 0, 3) s := make([]transaction.Signer, 0, 3)
// first we have proxy contract signature, as it will pay for the execution // first we have proxy contract signature, as it will pay for the execution
@ -266,7 +274,7 @@ func (c *Client) notaryCosigners(ir []*keys.PublicKey) ([]transaction.Signer, er
}) })
// then we have inner ring multiaddress signature // then we have inner ring multiaddress signature
m, _ := mn(ir) m, _ := mn(ir, committee)
multisigScript, err := sc.CreateMultiSigRedeemScript(m, ir) multisigScript, err := sc.CreateMultiSigRedeemScript(m, ir)
if err != nil { if err != nil {
@ -389,8 +397,8 @@ func (c *Client) notaryInnerRingList() ([]*keys.PublicKey, error) {
return res, nil return res, nil
} }
func (c *Client) notaryMultisigAccount(ir []*keys.PublicKey) (*wallet.Account, error) { func (c *Client) notaryMultisigAccount(ir []*keys.PublicKey, committee bool) (*wallet.Account, error) {
m, _ := mn(ir) m, _ := mn(ir, committee)
multisigAccount := wallet.NewAccountFromPrivateKey(c.acc.PrivateKey()) multisigAccount := wallet.NewAccountFromPrivateKey(c.acc.PrivateKey())
@ -430,10 +438,16 @@ func invocationParams(args ...interface{}) ([]sc.Parameter, error) {
} }
// mn returns M and N multi signature numbers. For NeoFS N is a length of // mn returns M and N multi signature numbers. For NeoFS N is a length of
// inner ring list, and M is a 2/3+1 of it (like in dBFT). // inner ring list, and M is a 2/3+1 of it (like in dBFT). If committee is
func mn(ir []*keys.PublicKey) (m int, n int) { // true, returns M as N/2+1.
func mn(ir []*keys.PublicKey, committee bool) (m int, n int) {
n = len(ir) n = len(ir)
if committee {
m = n/2 + 1
} else {
m = n*2/3 + 1 m = n*2/3 + 1
}
return return
} }