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

*: do not get private key from Account to check if it CanSign()

Browse source 
We have this API now to performs checks.
This commit is contained in:
Roman Khimov 2022-09-01 17:54:00 +03:00
parent 8d33206bb8
commit fd8da6fdb9
4 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cli/smartcontract/smart_contract.go
View file

@ -892,7 +892,7 @@ func getUnlockedAccount(wall *wallet.Wallet, addr util.Uint160, pass *string) (*
return nil, fmt.Errorf("wallet contains no account for '%s'", address.Uint160ToString(addr)) return nil, fmt.Errorf("wallet contains no account for '%s'", address.Uint160ToString(addr))
} }
if acc.PrivateKey() != nil { if acc.CanSign() {
return acc, nil return acc, nil
} }

2
pkg/consensus/consensus.go
View file

@ -377,7 +377,7 @@ func (s *service) getKeyPair(pubs []crypto.PublicKey) (int, crypto.PrivateKey, c
continue continue
} }
if acc.PrivateKey() == nil { if !acc.CanSign() {
err := acc.Decrypt(s.Config.Wallet.Password, s.wallet.Scrypt) err := acc.Decrypt(s.Config.Wallet.Password, s.wallet.Scrypt)
if err != nil { if err != nil {
s.log.Fatal("can't unlock account", zap.String("address", address.Uint160ToString(sh))) s.log.Fatal("can't unlock account", zap.String("address", address.Uint160ToString(sh)))

2
pkg/services/notary/node.go
View file

@ -25,7 +25,7 @@ func (n *Notary) UpdateNotaryNodes(notaryNodes keys.PublicKeys) {
for _, node := range notaryNodes { for _, node := range notaryNodes {
acc = n.wallet.GetAccount(node.GetScriptHash()) acc = n.wallet.GetAccount(node.GetScriptHash())
if acc != nil { if acc != nil {
if acc.PrivateKey() != nil { if acc.CanSign() {
break break
} }
err := acc.Decrypt(n.Config.MainCfg.UnlockWallet.Password, n.wallet.Scrypt) err := acc.Decrypt(n.Config.MainCfg.UnlockWallet.Password, n.wallet.Scrypt)

2
pkg/services/oracle/nodes.go
View file

@ -30,7 +30,7 @@ func (o *Oracle) UpdateOracleNodes(oracleNodes keys.PublicKeys) {
for i := range oracleNodes { for i := range oracleNodes {
acc = o.wallet.GetAccount(oracleNodes[i].GetScriptHash()) acc = o.wallet.GetAccount(oracleNodes[i].GetScriptHash())
if acc != nil { if acc != nil {
if acc.PrivateKey() != nil { if acc.CanSign() {
break break
} }
err := acc.Decrypt(o.MainCfg.UnlockWallet.Password, o.wallet.Scrypt) err := acc.Decrypt(o.MainCfg.UnlockWallet.Password, o.wallet.Scrypt)