CovenantSQL · zeqing-guo · Oct 23, 2018 · Oct 15, 2018 · Oct 16, 2018 · Oct 16, 2018
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/Gopkg.toml b/Gopkg.toml
@@ -60,6 +60,11 @@
   name = "github.com/CovenantSQL/xurls"
   branch = "master"
 
+[[override]]
+  name = "github.com/siddontang/go-mysql"
+  source = "github.com/CovenantSQL/go-mysql"
+  branch = "master"
+
 [prune]
   go-tests = true
   unused-packages = true

diff --git a/bin/docker-entry.sh b/bin/docker-entry.sh
@@ -24,5 +24,8 @@ cli)
 faucet)
     exec /app/cql-faucet -config ${COVENANT_CONF} "${@}"
     ;;
+explorer)
+    exec /app/cql-explorer -config ${COVENANT_CONF} "${@}"
+    ;;
 esac
 
diff --git a/blockproducer/blockindex.go b/blockproducer/blockindex.go
@@ -35,12 +35,12 @@ func newBlockNode(h uint32, block *types.Block, parent *blockNode) *blockNode {
 	var count uint32
 
 	if parent != nil {
-		count = parent.height + 1
+		count = parent.count + 1
 	} else {
 		count = 0
 	}
 	bn := &blockNode{
-		hash:   block.SignedHeader.BlockHash,
+		hash:   *block.BlockHash(),
 		parent: parent,
 		height: h,
 		count:  count,
@@ -79,6 +79,18 @@ func (bn *blockNode) ancestor(h uint32) *blockNode {
 	return ancestor
 }
 
+func (bn *blockNode) ancestorByCount(c uint32) *blockNode {
+	if c > bn.count {
+		return nil
+	}
+
+	ancestor := bn
+	for ancestor != nil && ancestor.count != c {
+		ancestor = ancestor.parent
+	}
+	return ancestor
+}
+
 type blockIndex struct {
 	mu    sync.RWMutex
 	index map[hash.Hash]*blockNode
@@ -107,9 +119,9 @@ func (bi *blockIndex) hasBlock(h hash.Hash) bool {
 	return has
 }
 
-func (bi *blockIndex) lookupBlock(h hash.Hash) *blockNode {
+func (bi *blockIndex) lookupNode(h *hash.Hash) *blockNode {
 	bi.mu.RLock()
 	defer bi.mu.RUnlock()
 
-	return bi.index[h]
+	return bi.index[*h]
 }
diff --git a/blockproducer/blockindex_test.go b/blockproducer/blockindex_test.go
@@ -138,7 +138,7 @@ func TestIndexBlock(t *testing.T) {
 		t.Fatalf("lack of block index: %v", bn1)
 	}
 
-	bn3 := bi.lookupBlock(bn0.hash)
+	bn3 := bi.lookupNode(&bn0.hash)
 	if !reflect.DeepEqual(bn0, bn3) {
 		t.Fatalf("two values should be equal: \n\tv0=%+v\n\tv1=%+v", bn0, bn3)
 	}