forked from TrueCloudLab/frostfs-node
[#1959] neofs-adm: Fix double multisig
Signed-off-by: Evgenii Stratonikov <evgeniy@morphbits.ru>support/v0.34
parent
2484c1d35e
commit
942155be6e
|
@ -395,6 +395,7 @@ func (c *initializeContext) sendMultiTx(script []byte, tryGroup bool, withConsen
|
||||||
var act *actor.Actor
|
var act *actor.Actor
|
||||||
var err error
|
var err error
|
||||||
|
|
||||||
|
withConsensus = withConsensus && !c.ConsensusAcc.Contract.ScriptHash().Equals(c.CommitteeAcc.ScriptHash())
|
||||||
if tryGroup {
|
if tryGroup {
|
||||||
// Even for consensus signatures we need the committee to pay.
|
// Even for consensus signatures we need the committee to pay.
|
||||||
signers := make([]actor.SignerAccount, 1, 2)
|
signers := make([]actor.SignerAccount, 1, 2)
|
||||||
|
|
|
@ -131,12 +131,17 @@ func (c *initializeContext) multiSign(tx *transaction.Transaction, accType strin
|
||||||
}
|
}
|
||||||
|
|
||||||
if len(tx.Scripts) == 0 {
|
if len(tx.Scripts) == 0 {
|
||||||
tx.Scripts = append(tx.Scripts, *w)
|
tx.Scripts = make([]transaction.Witness, len(tx.Signers))
|
||||||
} else {
|
|
||||||
tx.Scripts[0] = *w
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return nil
|
for i := range tx.Signers {
|
||||||
|
if tx.Signers[i].Account == h {
|
||||||
|
tx.Scripts[i] = *w
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return fmt.Errorf("%s account was not found among transaction signers", accType)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (c *initializeContext) transferGASToProxy() error {
|
func (c *initializeContext) transferGASToProxy() error {
|
||||||
|
|
Loading…
Reference in New Issue