Explorer V2

.gitignore

@@ -16,6 +16,8 @@ rebuilddb.conf
 cmd/rebuilddb/rebuilddb
 cmd/scanblocks/scanblocks
 fullscan.json
+*.swp
+*.swo
 CURRENT
 LOCK
 LOG

LICENSE

@@ -1,6 +1,7 @@
 ISC License
 
 Copyright (c) 2017, Jonathan Chappelow
+Copyright (c) 2017, The dcrdata developers
 Copyright (c) 2015-2016 The Decred developers
 
 Permission to use, copy, modify, and/or distribute this software for any

apimiddleware.go

@@ -168,26 +168,6 @@ func (c *appContext) BlockHashPathAndIndexCtx(next http.Handler) http.Handler {
 	})
 }
 
-func (c *appContext) BlockHashPathOrIndexCtx(next http.Handler) http.Handler {
-	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		hash := chi.URLParam(r, "blockhash")
-		height, _ := c.BlockData.GetBlockHeight(hash)
-		idx, err := strconv.ParseInt(hash, 10, 0)
-		if err == nil {
-			height = idx
-			hash, err = c.BlockData.GetBlockHash(idx)
-			if err != nil {
-				apiLog.Errorf("GetBlockHash(%d) failed: %v", idx, err)
-				http.NotFound(w, r)
-				return
-			}
-		}
-		ctx := context.WithValue(r.Context(), ctxBlockHash, hash)
-		ctx = context.WithValue(ctx, ctxBlockIndex, height)
-		next.ServeHTTP(w, r.WithContext(ctx))
-	})
-}
-
 // TransactionHashCtx returns a http.HandlerFunc that embeds the value at the url
 // part {txid} into the request context
 func TransactionHashCtx(next http.Handler) http.Handler {
@@ -224,16 +204,6 @@ func AddressPathCtx(next http.Handler) http.Handler {
 	})
 }
 
-// SearchPathCtx returns a http.HandlerFunc that embeds the value at the url part
-// {search} into the request context
-func SearchPathCtx(next http.Handler) http.Handler {
-	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		str := chi.URLParam(r, "search")
-		ctx := context.WithValue(r.Context(), ctxSearch, str)
-		next.ServeHTTP(w, r.WithContext(ctx))
-	})
-}
-
 // apiDocs generates a middleware with a "docs" in the context containing a
 // map of the routers handlers, etc.
 func apiDocs(mux *chi.Mux) func(next http.Handler) http.Handler {
@@ -248,6 +218,17 @@ func apiDocs(mux *chi.Mux) func(next http.Handler) http.Handler {
 	}
 }
 
+// SearchPathCtx returns a http.HandlerFunc that embeds the value at the url part
+// {search} into the request context (Still need this for the error page)
+// TODO: make new error system
+func SearchPathCtx(next http.Handler) http.Handler {
+	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		str := chi.URLParam(r, "search")
+		ctx := context.WithValue(r.Context(), ctxSearch, str)
+		next.ServeHTTP(w, r.WithContext(ctx))
+	})
+}
+
 // APIDirectory is the actual handler used with apiDocs
 // (e.g. mux.With(apiDocs(mux)).HandleFunc("/help", APIDirectory))
 func APIDirectory(w http.ResponseWriter, r *http.Request) {

apiroutes.go

@@ -23,10 +23,8 @@ type APIDataSource interface {
 	GetHeader(idx int) *dcrjson.GetBlockHeaderVerboseResult
 	GetBlockVerbose(idx int, verboseTx bool) *dcrjson.GetBlockVerboseResult
 	GetBlockVerboseByHash(hash string, verboseTx bool) *dcrjson.GetBlockVerboseResult
-	GetBlockVerboseWithStakeTxDetails(hash string) *apitypes.BlockDataWithTxType
 	GetRawTransaction(txid string) *apitypes.Tx
 	GetRawTransactionWithPrevOutAddresses(txid string) (*apitypes.Tx, [][]string)
-	GetExplorerTxData(txid string) *apitypes.ExplorerTxData
 	GetVoteInfo(txid string) (*apitypes.VoteInfo, error)
 	GetAllTxIn(txid string) []*apitypes.TxIn
 	GetAllTxOut(txid string) []*apitypes.TxOut