package blockchain
-/*
import (
"context"
+
"github.com/bytom/blockchain/pseudohsm"
"github.com/bytom/blockchain/txbuilder"
"github.com/bytom/crypto/ed25519/chainkd"
"github.com/bytom/net/http/httperror"
"github.com/bytom/net/http/httpjson"
+ log "github.com/sirupsen/logrus"
)
func init() {
- errorFormatter.Errors[Pseudohsm.ErrDuplicateKeyAlias] = httperror.Info{400, "BTM050", "Alias already exists"}
- errorFormatter.Errors[Pseudohsm.ErrInvalidAfter] = httperror.Info{400, "BTM801", "Invalid `after` in query"}
- errorFormatter.Errors[Pseudohsm.ErrTooManyAliasesToList] = httperror.Info{400, "BTM802", "Too many aliases to list"}
+ //Error code 050 represents alias of key duplicated
+ errorFormatter.Errors[pseudohsm.ErrDuplicateKeyAlias] = httperror.Info{400, "BTM050", "Alias already exists"}
+ //Error code 801 represents query request format error
+ errorFormatter.Errors[pseudohsm.ErrInvalidAfter] = httperror.Info{400, "BTM801", "Invalid `after` in query"}
+ //Error code 802 represents query reponses too many
+ errorFormatter.Errors[pseudohsm.ErrTooManyAliasesToList] = httperror.Info{400, "BTM802", "Too many aliases to list"}
}
-*/
-
-// PseudoHSM configures the Core to expose the PseudoHSM endpoints. It
-// is only included in non-production builds.
-/*
-func PseudoHSM(hsm *Pseudohsm.HSM) RunOption {
- return func(api *API) {
- h := &pseudoHSMHandler{PseudoHSM: hsm}
- needConfig := api.needConfig()
- api.mux.Handle("/hsm/create-key", needConfig(h.pseudohsmCreateKey))
- api.mux.Handle("/hsm/list-keys", needConfig(h.pseudohsmListKeys))
- api.mux.Handle("/hsm/delete-key", needConfig(h.pseudohsmDeleteKey))
- api.mux.Handle("/hsm/sign-transaction", needConfig(h.pseudohsmSignTemplates))
- api.mux.Handle("/hsm/reset-password", needConfig(h.pseudohsmResetPassword))
- api.mux.Handle("/hsm/update-alias", needConfig(h.pseudohsmUpdateAlias))
- }
+func (a *BlockchainReactor) pseudohsmCreateKey(ctx context.Context, in struct{ Alias, Password string }) (result *pseudohsm.XPub, err error) {
+ return a.hsm.XCreate(in.Alias, in.Password)
}
-
-type pseudoHSMHandler struct {
- PseudoHSM *Pseudohsm.HSM
-}
-*/
-
-
-func (a *BlockchainReactor) pseudohsmCreateKey(ctx context.Context, password string, in struct{ Alias string }) (result *Pseudohsm.XPub, err error) {
- return a.hsm.XCreate(password, in.Alias)
-}
-
-func (a *BlockchainReactor)) pseudohsmListKeys(ctx context.Context, query requestQuery) (page, error) {
+func (a *BlockchainReactor) pseudohsmListKeys(ctx context.Context, query requestQuery) (page, error) {
limit := query.PageSize
if limit == 0 {
- limit = defGenericPageSize // defGenericPageSize = 100
+ limit = defGenericPageSize // defGenericPageSize = 100
}
- xpubs, after, err := h.PseudoHSM.ListKeys(query.After, limit)
+ xpubs, after, err := a.hsm.ListKeys(query.After, limit)
if err != nil {
return page{}, err
}
}, nil
}
-func (a *BlockchainReactor) pseudohsmDeleteKey(ctx context.Context, xpub chainkd.XPub, password string) error {
- return a.hsm.XDelete(xpub, password)
+func (a *BlockchainReactor) pseudohsmDeleteKey(ctx context.Context, x struct {
+ Password string
+ XPub chainkd.XPub `json:"xpubs"`
+}) error {
+ return a.hsm.XDelete(x.XPub, x.Password)
}
func (a *BlockchainReactor) pseudohsmSignTemplates(ctx context.Context, x struct {
- Txs []*txbuilder.Template `json:"transactions"`
- XPubs []chainkd.XPub `json:"xpubs"`
-}) []interface{} {
- resp := make([]interface{}, 0, len(x.Txs))
+ Auth string
+ Txs []*txbuilder.Template `json:"transactions"`
+ XPub chainkd.XPub `json:"xpubs"`
+ XPrv chainkd.XPrv `json:"xprv"`
+}) interface{} {
+ resp := make([]interface{}, len(x.Txs))
+ var err error
for _, tx := range x.Txs {
- err := txbuilder.Sign(ctx, tx, x.XPubs, a.hsm.pseudohsmSignTemplate)
+ if x.Auth == "" {
+ err = txbuilder.Sign(context.Background(), tx, []chainkd.XPub{x.XPrv.XPub()}, "", func(_ context.Context, _ chainkd.XPub, path [][]byte, data [32]byte, _ string) ([]byte, error) {
+ derived := x.XPrv.Derive(path)
+ return derived.Sign(data[:]), nil
+ })
+ } else {
+ err = txbuilder.Sign(ctx, tx, []chainkd.XPub{x.XPub}, x.Auth, a.pseudohsmSignTemplate)
+ }
+
+ log.WithFields(log.Fields{"tx": tx, "build err": err}).Info("After sign transaction.")
if err != nil {
info := errorFormatter.Format(err)
- response = append(resp, info)
+ resp = append(resp, info)
} else {
resp = append(resp, tx)
}
}
+ log.WithField("resp", resp).Info("Sign Transaction complete.")
return resp
}
-func (a *BlockchainReactor) pseudohsmSignTemplate(ctx context.Context, xpub chainkd.XPub, path [][]byte, data [32]byte) ([]byte, error) {
- sigBytes, err := a.hsm.XSign(ctx, xpub, path, data[:])
- if err == Pseudohsm.ErrNoKey {
+func (a *BlockchainReactor) pseudohsmSignTemplate(ctx context.Context, xpub chainkd.XPub, path [][]byte, data [32]byte, password string) ([]byte, error) {
+ sigBytes, err := a.hsm.XSign(xpub, path, data[:], password)
+ if err == pseudohsm.ErrNoKey {
return nil, nil
}
return sigBytes, err
}
-// remote hsm used
-/*
-func RemoteHSM(hsm *remoteHSM) RunOption {
- return func(api *API) {
- h := &retmoteHSMHandler{RemoteHSM: hsm}
- needConfig := api.needConfig()
- api.mux.Handle("/hsm/sign-transaction", needConfig(h.Sign))
- }
+func (a *BlockchainReactor) pseudohsmResetPassword(ctx context.Context, x struct {
+ OldPassword string
+ NewPassword string
+ XPub chainkd.XPub `json:"xpubs"`
+}) error {
+ return a.hsm.ResetPassword(x.XPub, x.OldPassword, x.NewPassword)
}
-*/
-
-
-type remoteHSM struct {
- Client *rpc.Client
-}
-
-func remoteHSMHandler struct {
- RemoteHSM *remoteHSM
-}
-
-func New(conf *config.Config) *HSM {
-
- httpClient := new(http.Client)
- httpClient.Transport = &http.Transport{
- TLSClientConfig: tlsConfig,
- // The following fields are default values
- // copied from DefaultTransport.
- // (When you change them, be sure to move them
- // above this line so this comment stays true.)
- DialContext: (&net.Dialer{
- Timeout: 30 * time.Second,
- KeepAlive: 30 * time.Second,
- DualStack: true,
- }).DialContext,
- MaxIdleConns: 100,
- IdleConnTimeout: 90 * time.Second,
- TLSHandshakeTimeout: 10 * time.Second,
- ExpectContinueTimeout: 1 * time.Second,
- }
-
- return &remoteHSM{Client: &rpc.Client{
- BaseURL: conf.HsmUrl,
- AccessToken: conf.HsmAccessToken,
- Username: conf.processID,
- CoreID: conf.Id,
- Version: conf.version,
- BlockchainID: conf.BlockchainId.String(),
- Client: httpClient,
- }}
-}
-
-
-func (h *remoteHSM) Sign(ctx context.Context, pk ed25519.PublicKey, date [32]byte)([]byte, err error) {
- body := struct {
- Block *legacy.TxHeader `json:"txheader"`
- Pub json.HexBytes `json:"pubkey"`
- }{data, json.HexBytes(pk[:])}
- err = h.Client.Call(ctx, "/sign-transaction", body, &sigBytes)
- return sigBytes
+func (a *BlockchainReactor) pseudohsmUpdateAlias(ctx context.Context, x struct {
+ Password string
+ NewAlias string
+ XPub chainkd.XPub `json:"xpubs"`
+}) error {
+ return a.hsm.UpdateAlias(x.XPub, x.Password, x.NewAlias)
}
-*/
OSDN Git Service
