TrueCloudLab/neoneo-go
6
0
Fork 2
Code Issues Pull requests Projects Releases Packages Wiki Activity

context: handle the case when we have more sigs than needed

Browse source 
We can technically have more signatures in the file than we need and it's OK,
this case should be handled.
This commit is contained in:
Roman Khimov 2022-08-31 10:53:49 +03:00
parent 4b136e8ab1
commit 58707c2b1e
2 changed files with 38 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
pkg/smartcontract/context/context.go
View file

@ -96,14 +96,19 @@ func (c *ParameterContext) AddSignature(h util.Uint160, ctr *wallet.Contract, pu
return errors.New("public key is not present in script") return errors.New("public key is not present in script")
} }
item.AddSignature(pub, sig) item.AddSignature(pub, sig)
if len(item.Signatures) == len(ctr.Parameters) { if len(item.Signatures) >= len(ctr.Parameters) {
indexMap := map[string]int{} indexMap := map[string]int{}
for i := range pubs { for i := range pubs {
indexMap[hex.EncodeToString(pubs[i])] = i indexMap[hex.EncodeToString(pubs[i])] = i
} }
sigs := make([]sigWithIndex, 0, len(item.Signatures)) sigs := make([]sigWithIndex, len(item.Parameters))
var i int
for pub, sig := range item.Signatures { for pub, sig := range item.Signatures {
sigs = append(sigs, sigWithIndex{index: indexMap[pub], sig: sig}) sigs[i] = sigWithIndex{index: indexMap[pub], sig: sig}
i++
if i == len(sigs) {
break
}
} }
sort.Slice(sigs, func(i, j int) bool { sort.Slice(sigs, func(i, j int) bool {
return sigs[i].index < sigs[j].index return sigs[i].index < sigs[j].index

18
pkg/smartcontract/context/context_test.go
View file

@ -96,8 +96,9 @@ func TestParameterContext_AddSignatureMultisig(t *testing.T) {
sig := priv.SignHashable(uint32(c.Network), tx) sig := priv.SignHashable(uint32(c.Network), tx)
require.Error(t, c.AddSignature(ctr.ScriptHash(), ctr, priv.PublicKey(), sig)) require.Error(t, c.AddSignature(ctr.ScriptHash(), ctr, priv.PublicKey(), sig))
indices := []int{2, 3, 0} // random order indices := []int{2, 3, 0, 1} // random order
for _, i := range indices { testSigWit := func(t *testing.T, num int) {
for _, i := range indices[:num] {
sig := privs[i].SignHashable(uint32(c.Network), tx) sig := privs[i].SignHashable(uint32(c.Network), tx)
require.NoError(t, c.AddSignature(ctr.ScriptHash(), ctr, pubs[i], sig)) require.NoError(t, c.AddSignature(ctr.ScriptHash(), ctr, pubs[i], sig))
require.Error(t, c.AddSignature(ctr.ScriptHash(), ctr, pubs[i], sig)) require.Error(t, c.AddSignature(ctr.ScriptHash(), ctr, pubs[i], sig))
@ -116,6 +117,19 @@ func TestParameterContext_AddSignatureMultisig(t *testing.T) {
require.Equal(t, true, v.Estack().Pop().Value()) require.Equal(t, true, v.Estack().Pop().Value())
}) })
} }
t.Run("exact number of sigs", func(t *testing.T) {
testSigWit(t, 3)
})
t.Run("larger number of sigs", func(t *testing.T) {
// Clean up.
var itm = c.Items[ctr.ScriptHash()]
for i := range itm.Parameters {
itm.Parameters[i].Value = nil
}
itm.Signatures = make(map[string][]byte)
testSigWit(t, 4)
})
}
func newTestVM(w *transaction.Witness, tx *transaction.Transaction) *vm.VM { func newTestVM(w *transaction.Witness, tx *transaction.Transaction) *vm.VM {
ic := &interop.Context{Network: uint32(netmode.UnitTestNet), Container: tx, Functions: crypto.Interops} ic := &interop.Context{Network: uint32(netmode.UnitTestNet), Container: tx, Functions: crypto.Interops}