update pubkey

dungtt-astra · Feb 24, 2023 · 90661ad · 90661ad
1 parent 2b29e0a
commit 90661ad
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 20 deletions.
diff --git a/account/account.go b/account/account.go
@@ -14,7 +14,6 @@ import (
 	ethermintHd "github.com/evmos/ethermint/crypto/hd"
 	ethermintTypes "github.com/evmos/ethermint/types"
 	"github.com/pkg/errors"
-	"strings"
 )
 
 type Account struct {
@@ -25,22 +24,6 @@ func NewAccount(coinType uint32) *Account {
 	return &Account{coinType: coinType}
 }
 
-func importPubkey(pk string) (*ethsecp256k1.PubKey, error) {
-
-	if strings.ContainsAny(pk, "{") {
-		pk = strings.Split(strings.Split(pk, "{")[1], "}")[0]
-	}
-
-	key, err := hex.DecodeString(pk)
-	if err != nil {
-		return nil, err
-	}
-
-	return &ethsecp256k1.PubKey{
-		Key: key,
-	}, nil
-}
-
 //Create new an Account
 
 func (a *Account) CreateAccount() (*PrivateKeySerialized, error) {

diff --git a/account/pubkey.go b/account/pubkey.go
@@ -13,17 +13,19 @@ type PKAccount struct {
 	publicKey ethsecp256k1.PubKey
 }
 
-func NewPKAccount(pubkey string) *PKAccount {
+func NewPKAccount(pubkey string) (*PKAccount, error) {
 	pubkey = strings.Split(strings.Split(pubkey, "{")[1], "}")[0]
+
 	key, err := hex.DecodeString(pubkey)
 	if err != nil {
-		panic(err)
+		return nil, err
 	}
+
 	return &PKAccount{
 		publicKey: ethsecp256k1.PubKey{
 			Key: key,
 		},
-	}
+	}, nil
 }
 
 func (pka *PKAccount) PublicKey() cryptoTypes.PubKey {