Optimize address API

services/address/address_test.go

@@ -0,0 +1,19 @@
+package address
+
+import (
+	"encoding/hex"
+	"testing"
+)
+
+func TestNewAddresses(t *testing.T) {
+	privateKeyHex := "fff2cefe258ca60ae5f5abec99b5d63e2a561c40d784ee50b04eddf8efc84b0d"
+	privateKey, addr, eaddr, err := NewAddresses(privateKeyHex)
+	if err != nil {
+		t.Fatal(err)
+	}
+	pkHex := hex.EncodeToString(privateKey.Serialize())
+	if pkHex != privateKeyHex {
+		t.Fatalf("%s != %s (expect)", pkHex, privateKeyHex)
+	}
+	t.Logf("privateKey:%s addr:%s pkAddr:%s evmAddr:%s", pkHex, addr.PKHAddress().String(), addr.String(), eaddr.String())
+}

services/address/api.go

@@ -16,6 +16,7 @@ import (
 	"github.com/Qitmeer/qng/rpc"
 	"github.com/Qitmeer/qng/rpc/api"
 	"github.com/Qitmeer/qng/rpc/client/cmds"
+	ecommon "github.com/ethereum/go-ethereum/common"
 	"sync"
 )
 
@@ -94,30 +95,36 @@ func NewPrivateAddressAPI(ai *AddressApi) *PrivateAddressAPI {
 }
 
 func (api *PrivateAddressAPI) GetAddresses(privateKeyHex string) (interface{}, error) {
-	privkeyByte, err := hex.DecodeString(privateKeyHex)
+	privateKey, addr, eaddr, err := NewAddresses(privateKeyHex)
 	if err != nil {
 		return nil, err
 	}
+	result := qjson.OrderedResult{
+		qjson.KV{Key: "PrivateKey", Val: hex.EncodeToString(privateKey.Serialize())},
+		qjson.KV{Key: "PKHAddress", Val: addr.PKHAddress().String()},
+		qjson.KV{Key: "PKAddress", Val: addr.String()},
+		qjson.KV{Key: "MeerEVM Address", Val: eaddr.String()},
+	}
+	return result, nil
+}
+
+func NewAddresses(privateKeyHex string) (ecc.PrivateKey, *address.SecpPubKeyAddress, ecommon.Address, error) {
+	privkeyByte, err := hex.DecodeString(privateKeyHex)
+	if err != nil {
+		return nil, nil, ecommon.Address{}, err
+	}
 	if len(privkeyByte) != 32 {
-		return nil, fmt.Errorf("error length:%d", len(privkeyByte))
+		return nil, nil, ecommon.Address{}, fmt.Errorf("error length:%d", len(privkeyByte))
 	}
 	privateKey, pubKey := ecc.Secp256k1.PrivKeyFromBytes(privkeyByte)
-
 	serializedKey := pubKey.SerializeCompressed()
 	addr, err := address.NewSecpPubKeyAddress(serializedKey, params.ActiveNetParams.Params)
 	if err != nil {
-		return nil, err
+		return nil, nil, ecommon.Address{}, err
 	}
 	eaddr, err := common.NewMeerEVMAddress(pubKey.SerializeUncompressed())
 	if err != nil {
-		return nil, err
-	}
-	result := qjson.OrderedResult{
-		qjson.KV{Key: "PrivateKey", Val: hex.EncodeToString(privateKey.Serialize())},
-		qjson.KV{Key: "PKHAddress", Val: addr.PKHAddress().String()},
-		qjson.KV{Key: "PKAddress", Val: addr.String()},
-		qjson.KV{Key: "MeerEVM Address", Val: eaddr.String()},
+		return nil, nil, ecommon.Address{}, err
 	}
-
-	return result, nil
+	return privateKey, addr, eaddr, nil
 }