Support address history indexing (#4)

navcoin · Oct 18, 2020 · 8f083a5 · 8f083a5
1 parent 0b7c488
commit 8f083a5
Show file tree

Hide file tree

Showing 39 changed files with 631 additions and 837 deletions.
diff --git a/Dockerfile.indexerd → Dockerfile b/Dockerfile.indexerd → Dockerfile
diff --git a/Dockerfile.addressValidator b/Dockerfile.addressValidator
diff --git a/Dockerfile.cfundValidator b/Dockerfile.cfundValidator
diff --git a/Dockerfile.indexerCli b/Dockerfile.indexerCli
diff --git a/bin/build b/bin/build
@@ -14,14 +14,5 @@ dingo -src=./internal/config/di -dest=./generated
 
 export DOCKER_BUILDKIT=1
 
-docker build -f ./Dockerfile.indexerd . -t navexplorer/indexer:$tag
+docker build -f ./Dockerfile . -t navexplorer/indexer:$tag
 docker push navexplorer/indexer:$tag
-
-#docker build -f ./Dockerfile.indexerCli . -t navexplorer/indexer-cli:$tag
-#docker push navexplorer/indexer-cli:$tag
-
-docker build -f ./Dockerfile.addressValidator . -t navexplorer/address-validator:$tag
-docker push navexplorer/address-validator:$tag
-
-#docker build -f ./Dockerfile.cfundValidator . -t navexplorer/cfund-validator:$tag
-#docker push navexplorer/cfund-validator:$tag
diff --git a/cmd/address-validator/main.go b/cmd/address-validator/main.go
@@ -1,9 +1,23 @@
 package main
 
 import (
-	"github.com/NavExplorer/navexplorer-indexer-go/internal/validator"
+	"github.com/NavExplorer/navexplorer-indexer-go/generated/dic"
+	"github.com/NavExplorer/navexplorer-indexer-go/internal/config"
+	"github.com/sarulabs/dingo/v3"
+	"os"
 )
 
 func main() {
-	new(validator.AddressValidator).Execute()
+	config.Init()
+
+	container, _ := dic.NewContainer(dingo.App)
+	container.GetElastic().InstallMappings()
+
+	addressRepo := container.GetAddressRepo()
+	rewinder := container.GetAddressRewinder()
+
+	address, err := addressRepo.GetAddress(os.Args[1])
+	if err == nil {
+		rewinder.ResetAddress(address)
+	}
 }
diff --git a/cmd/cfund-validator/main.go b/cmd/cfund-validator/main.go
diff --git a/cmd/soft-fork/main.go b/cmd/soft-fork/main.go
@@ -0,0 +1,39 @@
+package main
+
+import (
+	"github.com/NavExplorer/navexplorer-indexer-go/generated/dic"
+	"github.com/NavExplorer/navexplorer-indexer-go/internal/config"
+	"github.com/sarulabs/dingo/v3"
+	log "github.com/sirupsen/logrus"
+)
+
+var container *dic.Container
+
+func main() {
+	config.Init()
+
+	container, _ = dic.NewContainer(dingo.App)
+	container.GetElastic().InstallMappings()
+	container.GetSoftforkService().InitSoftForks()
+	bestBlock, err := container.GetBlockRepo().GetBestBlock()
+	if err != nil {
+		log.Fatal(err)
+	}
+
+	for i := 1; i <= int(bestBlock.Height); i += 2016 {
+		blocks, err := container.GetBlockRepo().GetBlocksBetweenHeight(uint64(i), uint64(i+2016))
+		if err != nil {
+			log.Fatal(err)
+		}
+		for _, block := range blocks {
+			container.GetSoftforkIndexer().Index(block)
+		}
+		container.GetElastic().Persist()
+	}
+	container.GetElastic().Persist()
+	//block, err := container.GetBlockRepo().GetBlockByHeight()
+	//if err == nil {
+	//	log.Info("Rewind SoftForks to height: ", block.Height)
+	////	container.GetSoftforkRewinder().Rewind(block.Height - 10)
+	//}
+}
diff --git a/config/mappings/address.json b/config/mappings/address.json
@@ -1,5 +1,8 @@
 {
   "mappings": {
+    "_source": {
+      "excludes": ["rich_list"]
+    },
     "properties": {
       "hash": {
         "type": "text",
@@ -11,47 +14,15 @@
         }
       },
       "height": {"type": "long"},
-      "balance": {"type": "long"},
-      "received": {
-        "type": "long"
-      },
-      "receivedCount": {
-        "type": "long"
-      },
-      "sent": {
-        "type": "long"
-      },
-      "sentCount": {
-        "type": "long"
-      },
-      "staked": {
-        "type": "long"
-      },
-      "stakedCount": {
-        "type": "long"
-      },
-      "coldReceived": {
-        "type": "long"
-      },
-      "coldReceivedCount": {
-        "type": "long"
-      },
-      "coldSent": {
-        "type": "long"
-      },
-      "coldSentCount": {
-        "type": "long"
-      },
-      "coldStaked": {
-        "type": "long"
+      "spendable": {"type": "long"},
+      "stakabout": {"type": "long"},
+      "voting_weight": {"type": "long"},
+      "created_time": {
+        "type": "date"
       },
-      "coldStakedCount": {
+      "created_block": {
         "type": "long"
-      },
-      "coldBalance": {
-        "type": "long"
-      },
-      "position": {"type": "long"}
+      }
     }
   },
   "settings": {

diff --git a/config/mappings/addresstransaction.json → config/mappings/addresshistory.json b/config/mappings/addresstransaction.json → config/mappings/addresshistory.json
@@ -1,14 +1,14 @@
 {
   "mappings": {
     "properties": {
-      "hash": {
-        "type": "text",
-        "fields": {
-          "keyword": {
-            "type": "keyword",
-            "ignore_above": 256
-          }
-        }
+      "height": {
+        "type": "long"
+      },
+      "txindex": {
+        "type": "integer"
+      },
+      "time": {
+        "type": "date"
       },
       "txid": {
         "type": "text",
@@ -19,16 +19,7 @@
           }
         }
       },
-      "height": {
-        "type": "long"
-      },
-      "index": {
-        "type": "integer"
-      },
-      "time": {
-        "type": "date"
-      },
-      "type": {
+      "address": {
         "type": "text",
         "fields": {
           "keyword": {
@@ -37,13 +28,31 @@
           }
         }
       },
-      "input": {"type": "long"},
-      "output": {"type": "long"},
-      "total": {"type": "long"},
+      "changes": {
+        "type": "nested",
+        "properties": {
+          "spendable": {"type": "long"},
+          "stakable": {"type": "long"},
+          "voting_weight": {"type": "long"}
+        }
+      },
       "balance": {
-        "type": "long"
+        "type": "nested",
+        "properties": {
+          "spendable": {"type": "long"},
+          "stakable": {"type": "long"},
+          "voting_weight": {"type": "long"}
+        }
+      },
+      "is_stake": {
+        "type": "boolean"
+      },
+      "is_cfund_payout": {
+        "type": "boolean"
       },
-      "cold": {"type": "boolean"}
+      "is_stake_payout": {
+        "type": "boolean"
+      }
     }
   },
   "settings":{

diff --git a/go.mod b/go.mod
@@ -3,19 +3,21 @@ module github.com/NavExplorer/navexplorer-indexer-go
 go 1.13
 
 require (
-	github.com/NavExplorer/navcoind-go v0.1.8-0.20200527214456-804845973a06
-	github.com/NavExplorer/subscriber v0.0.0-20200601212953-3a6c48dd3d5d
+	github.com/NavExplorer/navcoind-go v0.1.8-0.20200709223613-3322962ba291
+	github.com/NavExplorer/subscriber v0.0.0-20200923000930-1321b56838fc
 	github.com/certifi/gocertifi v0.0.0-20200211180108-c7c1fbc02894 // indirect
 	github.com/dgraph-io/badger/v2 v2.0.3 // indirect
 	github.com/getsentry/raven-go v0.2.0
 	github.com/gosimple/slug v1.9.0
 	github.com/joho/godotenv v1.3.0
+	github.com/mr-tron/base58 v1.2.0
 	github.com/olivere/elastic/v7 v7.0.9
 	github.com/patrickmn/go-cache v2.1.0+incompatible
 	github.com/sarulabs/dingo/v3 v3.1.0
 	github.com/sirupsen/logrus v1.6.0
 	github.com/spf13/cobra v1.0.0
 	github.com/spf13/pflag v1.0.5 // indirect
 	github.com/streadway/amqp v0.0.0-20200108173154-1c71cc93ed71
+	golang.org/x/crypto v0.0.0-20190621222207-cc06ce4a13d4
 	gopkg.in/natefinch/lumberjack.v2 v2.0.0
 )