status-im/status-keycard-go
2
0
Fork 0
mirror of https://github.com/status-im/status-keycard-go.git synced 2025-01-18 18:31:56 +00:00
Code Issues Projects Releases Wiki Activity

exportKey return the address too

Browse Source
This commit is contained in:
Andrea Franz 2021-10-08 11:06:46 +02:00
parent e494db0f35
commit fafb1a2f56
2 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
keycard_context.go
View File

@ -4,6 +4,7 @@ import (
"fmt"
"github.com/ebfe/scard"
"github.com/ethereum/go-ethereum/crypto"
keycard "github.com/status-im/keycard-go"
"github.com/status-im/keycard-go/apdu"
"github.com/status-im/keycard-go/globalplatform"
@ -273,19 +274,29 @@ func (kc *keycardContext) signWithPath(data []byte, path string) (*types.Signatu
return sig, nil
}
func (kc *keycardContext) exportKey(derive bool, makeCurrent bool, onlyPublic bool, path string) ([]byte, []byte, error) {
func (kc *keycardContext) exportKey(derive bool, makeCurrent bool, onlyPublic bool, path string) ([]byte, []byte, string, error) {
<-kc.connected
if kc.runErr != nil {
return nil, nil, kc.runErr
return nil, nil, "", kc.runErr
}
address := ""
privKey, pubKey, err := kc.cmdSet.ExportKey(derive, makeCurrent, onlyPublic, path)
if err != nil {
l("exportKey failed %+v", err)
return nil, nil, err
return nil, nil, "", err
}
return privKey, pubKey, nil
if pubKey != nil {
ecdsaPubKey, err := crypto.UnmarshalPubkey(pubKey)
if err != nil {
return nil, nil, "", err
}
address = crypto.PubkeyToAddress(*ecdsaPubKey).Hex()
}
return privKey, pubKey, address, nil
}
func (kc *keycardContext) loadSeed(seed []byte) ([]byte, error) {

4
main.go
View File

@ -262,12 +262,12 @@ func ExportKey(jsonParams *C.char) *C.char {
return retValue("error", err.Error())
}
privKey, pubKey, err := kctx.exportKey(params.Derive, params.MakeCurrent, params.OnlyPublic, params.Path)
privKey, pubKey, address, err := kctx.exportKey(params.Derive, params.MakeCurrent, params.OnlyPublic, params.Path)
if err != nil {
return retValue("error", err.Error())
}
return retValue("ok", true, "privateKey", hexString(privKey), "publicKey", hexString(pubKey))
return retValue("ok", true, "privateKey", hexString(privKey), "publicKey", hexString(pubKey), "address", address)
}
//export LoadSeed