aarifullin/neoneo-go
1
0
Fork 0
forked from TrueCloudLab/neoneo-go
Code Pull requests Activity

wallet: respect user-locked accounts, don't sign with them

Browse source 
NEP-6 has a notion of locked acccounts and SignTx must respect this user's
choice. For some reason this setting was inappropriately used by our RPC
client tests (probably a different kind of lock was meant).
This commit is contained in:
Roman Khimov 2022-08-24 17:40:14 +03:00
parent 54c5fd61df
commit 8b132cba0c
3 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkg/services/rpcsrv/client_test.go
View file

@ -850,7 +850,6 @@ func TestSignAndPushInvocationTx(t *testing.T) {
Parameters: []wallet.ContractParam{},
Deployed: true,
},
Locked: true,
Default: false,
}
@ -866,7 +865,6 @@ func TestSignAndPushInvocationTx(t *testing.T) {
},
Deployed: true,
},
Locked: true,
Default: false,
}

5
pkg/wallet/account.go
View file

@ -90,6 +90,9 @@ func (a *Account) SignTx(net netmode.Magic, t *transaction.Transaction) error {
accHash util.Uint160
err error
)
if a.Locked {
return errors.New("account is locked")
}
if a.Contract == nil {
return errors.New("account has no contract")
}
@ -119,7 +122,7 @@ func (a *Account) SignTx(net netmode.Magic, t *transaction.Transaction) error {
return nil
}
if a.privateKey == nil {
return errors.New("account is not unlocked")
return errors.New("account key is not available (need to decrypt?)")
}
sign := a.privateKey.SignHashable(uint32(net), t)

4
pkg/wallet/account_test.go
View file

@ -134,6 +134,10 @@ func TestContractSignTx(t *testing.T) {
require.Equal(t, 1, len(tx.Scripts))
require.Equal(t, 66, len(tx.Scripts[0].InvocationScript))
acc2.Locked = true
require.Error(t, acc2.SignTx(0, tx)) // Locked account.
acc2.Locked = false
acc2.privateKey = nil
require.Error(t, acc2.SignTx(0, tx)) // No private key.