Fix: contract calls stats

baking-bad · Oct 12, 2020 · c7558c6 · c7558c6
1 parent 85732cc
commit c7558c6
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/cmd/api/handlers/stats.go b/cmd/api/handlers/stats.go
@@ -149,6 +149,12 @@ func getHistogramOptions(name, network string, addresses ...string) ([]elastic.H
 			Kind:  elastic.HistogramFilterKindExists,
 		})
 
+		filters = append(filters, elastic.HistogramFilter{
+			Field: "status",
+			Value: "applied",
+			Kind:  elastic.HistogramFilterKindMatch,
+		})
+
 		if len(addresses) > 0 {
 			filters = append(filters, elastic.HistogramFilter{
 				Kind:  elastic.HistogramFilterKindAddresses,

diff --git a/internal/elastic/contracts.go b/internal/elastic/contracts.go
@@ -279,6 +279,7 @@ func (e *Elastic) GetDAppStats(network string, addresses []string, period string
 
 	matches := []qItem{
 		matchQ("network", network),
+		exists("entrypoint"),
 		boolQ(
 			should(addressMatches...),
 			minimumShouldMatch(1),
@@ -300,7 +301,7 @@ func (e *Elastic) GetDAppStats(network string, addresses []string, period string
 	).Add(
 		aggs(
 			aggItem{"users", cardinality("source.keyword")},
-			aggItem{"tx", count("indexed_time")},
+			aggItem{"calls", count("indexed_time")},
 			aggItem{"volume", sum("amount")},
 		),
 	).Zero()

diff --git a/internal/elastic/data.go b/internal/elastic/data.go
@@ -281,13 +281,13 @@ type TokenUsageStats map[string]TokenMethodUsageStats
 // DAppStats -
 type DAppStats struct {
 	Users  int64 `json:"users"`
-	Txs    int64 `json:"txs"`
+	Calls  int64 `json:"txs"`
 	Volume int64 `json:"volume"`
 }
 
 // ParseElasticJSON -
 func (stats *DAppStats) ParseElasticJSON(hit gjson.Result) {
-	stats.Txs = hit.Get("tx.value").Int()
+	stats.Calls = hit.Get("calls.value").Int()
 	stats.Users = hit.Get("users.value").Int()
 	stats.Volume = hit.Get("volume.value").Int()
 }