log "github.com/sirupsen/logrus"
cmn "github.com/tendermint/tmlibs/common"
- "github.com/bytom/accesstoken"
- "github.com/bytom/blockchain/txfeed"
- cfg "github.com/bytom/config"
- "github.com/bytom/dashboard/dashboard"
- "github.com/bytom/dashboard/equity"
- "github.com/bytom/errors"
- "github.com/bytom/mining/cpuminer"
- "github.com/bytom/mining/miningpool"
- "github.com/bytom/net/http/authn"
- "github.com/bytom/net/http/gzip"
- "github.com/bytom/net/http/httpjson"
- "github.com/bytom/net/http/static"
- "github.com/bytom/net/websocket"
- "github.com/bytom/netsync"
- "github.com/bytom/protocol"
- "github.com/bytom/protocol/bc"
- "github.com/bytom/wallet"
+ "github.com/bytom/bytom/accesstoken"
+ "github.com/bytom/bytom/blockchain/txfeed"
+ cfg "github.com/bytom/bytom/config"
+ "github.com/bytom/bytom/dashboard/dashboard"
+ "github.com/bytom/bytom/dashboard/equity"
+ "github.com/bytom/bytom/errors"
+ "github.com/bytom/bytom/event"
+ "github.com/bytom/bytom/mining/cpuminer"
+ "github.com/bytom/bytom/mining/miningpool"
+ "github.com/bytom/bytom/net/http/authn"
+ "github.com/bytom/bytom/net/http/gzip"
+ "github.com/bytom/bytom/net/http/httpjson"
+ "github.com/bytom/bytom/net/http/static"
+ "github.com/bytom/bytom/net/websocket"
+ "github.com/bytom/bytom/netsync"
+ "github.com/bytom/bytom/p2p"
+ "github.com/bytom/bytom/protocol"
+ "github.com/bytom/bytom/wallet"
)
var (
// SUCCESS indicates the rpc calling is successful.
SUCCESS = "success"
// FAIL indicated the rpc calling is failed.
- FAIL = "fail"
+ FAIL = "fail"
+ logModule = "api"
)
// Response describes the response standard.
// API is the scheduling center for server
type API struct {
- sync *netsync.SyncManager
+ sync NetSync
wallet *wallet.Wallet
accessTokens *accesstoken.CredentialStore
chain *protocol.Chain
cpuMiner *cpuminer.CPUMiner
miningPool *miningpool.MiningPool
notificationMgr *websocket.WSNotificationManager
- newBlockCh chan *bc.Hash
+ eventDispatcher *event.Dispatcher
}
func (a *API) initServer(config *cfg.Config) {
// StartServer start the server
func (a *API) StartServer(address string) {
- log.WithField("api address:", address).Info("Rpc listen")
+ log.WithFields(log.Fields{"module": logModule, "api address:": address}).Info("Rpc listen")
listener, err := net.Listen("tcp", address)
if err != nil {
cmn.Exit(cmn.Fmt("Failed to register tcp port: %v", err))
// we call it.
go func() {
if err := a.server.Serve(listener); err != nil {
- log.WithField("error", errors.Wrap(err, "Serve")).Error("Rpc server")
+ log.WithFields(log.Fields{"module": logModule, "error": errors.Wrap(err, "Serve")}).Error("Rpc server")
}
}()
}
+type NetSync interface {
+ IsListening() bool
+ IsCaughtUp() bool
+ PeerCount() int
+ GetNetwork() string
+ BestPeer() *netsync.PeerInfo
+ DialPeerWithAddress(addr *p2p.NetAddress) error
+ GetPeerInfos() []*netsync.PeerInfo
+ StopPeer(peerID string) error
+}
+
// NewAPI create and initialize the API
-func NewAPI(sync *netsync.SyncManager, wallet *wallet.Wallet, txfeeds *txfeed.Tracker, cpuMiner *cpuminer.CPUMiner, miningPool *miningpool.MiningPool, chain *protocol.Chain, config *cfg.Config, token *accesstoken.CredentialStore, newBlockCh chan *bc.Hash, notificationMgr *websocket.WSNotificationManager) *API {
+func NewAPI(sync NetSync, wallet *wallet.Wallet, txfeeds *txfeed.Tracker, cpuMiner *cpuminer.CPUMiner, miningPool *miningpool.MiningPool, chain *protocol.Chain, config *cfg.Config, token *accesstoken.CredentialStore, dispatcher *event.Dispatcher, notificationMgr *websocket.WSNotificationManager) *API {
api := &API{
sync: sync,
wallet: wallet,
cpuMiner: cpuMiner,
miningPool: miningPool,
- newBlockCh: newBlockCh,
+ eventDispatcher: dispatcher,
notificationMgr: notificationMgr,
}
api.buildHandler()
m := http.NewServeMux()
if a.wallet != nil {
walletEnable = true
-
m.Handle("/create-account", jsonHandler(a.createAccount))
+ m.Handle("/update-account-alias", jsonHandler(a.updateAccountAlias))
m.Handle("/list-accounts", jsonHandler(a.listAccounts))
m.Handle("/delete-account", jsonHandler(a.deleteAccount))
m.Handle("/list-assets", jsonHandler(a.listAssets))
m.Handle("/create-key", jsonHandler(a.pseudohsmCreateKey))
+ m.Handle("/update-key-alias", jsonHandler(a.pseudohsmUpdateKeyAlias))
m.Handle("/list-keys", jsonHandler(a.pseudohsmListKeys))
m.Handle("/delete-key", jsonHandler(a.pseudohsmDeleteKey))
m.Handle("/reset-key-password", jsonHandler(a.pseudohsmResetPassword))
m.Handle("/restore-wallet", jsonHandler(a.restoreWalletImage))
m.Handle("/rescan-wallet", jsonHandler(a.rescanWallet))
m.Handle("/wallet-info", jsonHandler(a.getWalletInfo))
+ m.Handle("/recovery-wallet", jsonHandler(a.recoveryFromRootXPubs))
} else {
log.Warn("Please enable wallet")
}
m.Handle("/submit-transaction", jsonHandler(a.submit))
m.Handle("/submit-transactions", jsonHandler(a.submitTxs))
m.Handle("/estimate-transaction-gas", jsonHandler(a.estimateTxGas))
+ m.Handle("/estimate-chain-transaction-gas", jsonHandler(a.estimateChainTxGas))
m.Handle("/get-unconfirmed-transaction", jsonHandler(a.getUnconfirmedTx))
m.Handle("/list-unconfirmed-transactions", jsonHandler(a.listUnconfirmedTxs))
m.HandleFunc("/websocket-subscribe", a.websocketHandler)
- handler := latencyHandler(m, walletEnable)
+ handler := walletHandler(m, walletEnable)
handler = webAssetsHandler(handler)
handler = gzip.Handler{Handler: handler}
-
a.handler = handler
}
// TODO(tessr): check that this path exists; return early if this path isn't legit
req, err := authenticator.Authenticate(req)
if err != nil {
- log.WithField("error", errors.Wrap(err, "Serve")).Error("Authenticate fail")
+ log.WithFields(log.Fields{"module": logModule, "error": errors.Wrap(err, "Serve")}).Error("Authenticate fail")
err = errors.WithDetail(errNotAuthenticated, err.Error())
errorFormatter.Write(req.Context(), rw, err)
return
})
}
-// latencyHandler take latency for the request url path, and redirect url path to wait-disable when wallet is closed
-func latencyHandler(m *http.ServeMux, walletEnable bool) http.Handler {
+func walletHandler(m *http.ServeMux, walletEnable bool) http.Handler {
return http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
- // latency for the request url path
- if l := latency(m, req); l != nil {
- defer l.RecordSince(time.Now())
- }
-
// when the wallet is not been opened and the url path is not been found, modify url path to error,
// and redirect handler to error
if _, pattern := m.Handler(req); pattern != req.URL.Path && !walletEnable {
OSDN Git Service
