fix(): add gateway3 get block hash_list

Author: zyjblockchain

blocks.go

@@ -7,6 +7,7 @@ import (
 	"github.com/everFinance/goar"
 	"github.com/everFinance/goar/types"
 	"github.com/everFinance/goar/utils"
+	"gopkg.in/h2non/gentleman.v2"
 	"strings"
 )
 
@@ -23,13 +24,16 @@ func GetBlockIdxs(startHeight int64, arCli *goar.Client) (*BlockIdxs, error) {
 		return nil, err
 	}
 	endHeight := info.Height
-
-	// get block hash_list from trust node
-	spiltList, err := GetBlockHashList(arCli, startHeight, endHeight)
+	// get block hash_list from gateway3
+	spiltList, err := GetBlockHashListByGateway3(startHeight, endHeight)
 	if err != nil {
-		log.Error("GetBlockHashList(arCli,startHeight,endHeight)", "err", err)
-		// get block hash_list from no-trust node
-		spiltList, err = GetBlockHashListFromPeers(arCli, startHeight, endHeight, 5)
+		// get block hash_list from trust node
+		spiltList, err = GetBlockHashList(arCli, startHeight, endHeight)
+		if err != nil {
+			log.Error("GetBlockHashList(arCli,startHeight,endHeight)", "err", err)
+			// get block hash_list from no-trust node
+			spiltList, err = GetBlockHashListFromPeers(arCli, startHeight, endHeight, 5)
+		}
 	}
 
 	if err != nil {
@@ -78,7 +82,8 @@ func GetBlockHashList(arCli *goar.Client, startHeight, endHeight int64) ([]strin
 	if curHeight < endHeight {
 		return nil, fmt.Errorf("curHeight must >= endHeight; curHeight:%d,endHeight:%d", curHeight, endHeight)
 	}
-	spiltList := list[curHeight-endHeight : endHeight-startHeight+1]
+	// todo bug fix
+	spiltList := list[curHeight-endHeight : curHeight-startHeight+1]
 	return spiltList, nil
 }
 
@@ -135,3 +140,43 @@ func strArrCheckSum(ss []string) string {
 	hash := sha256.Sum256([]byte(strings.Join(ss, "")))
 	return string(hash[:])
 }
+
+// TODO Lev suggest Temporary Solutions
+var gateway3Cli = gentleman.New().URL("http://gateway-3.arweave.net:1984")
+
+func getBlockHashListByHeightRange(startHeight, endHeight int64) ([]string, error) {
+	gateway3Cli.AddPath(fmt.Sprintf("/hash_list/%d/%d", startHeight, endHeight))
+
+	req := gateway3Cli.Request()
+	resp, err := req.Send()
+	if err != nil {
+		return nil, err
+	}
+
+	if !resp.Ok {
+		return nil, errors.New("resp is not ok")
+	}
+
+	defer resp.Close()
+	list := make([]string, 0, endHeight-startHeight+1)
+	if err = resp.JSON(&list); err != nil {
+		return nil, err
+	}
+
+	return list, nil
+}
+
+func GetBlockHashListByGateway3(startHeight, endHeight int64) ([]string, error) {
+	if startHeight > endHeight {
+		return nil, fmt.Errorf("startHeight:%d must <= endHeight:%d", startHeight, endHeight)
+	}
+	list, err := getBlockHashListByHeightRange(startHeight, endHeight)
+	if err != nil {
+		return nil, err
+	}
+	// verify
+	if len(list) != int(endHeight-startHeight+1) {
+		return nil, errors.New("get list incorrect")
+	}
+	return list, nil
+}

blocks_test.go

@@ -0,0 +1,18 @@
+package arsyncer
+
+import (
+	"github.com/everFinance/goar"
+	"github.com/stretchr/testify/assert"
+	"testing"
+)
+
+func TestGetBlockHashListByHeightRange(t *testing.T) {
+	start := int64(878791)
+	end := int64(878793)
+	list, err := GetBlockHashListByGateway3(start, end)
+	assert.NoError(t, err)
+	t.Log(list)
+	arCli := goar.NewClient("https://arweave.net")
+	list, err = GetBlockHashList(arCli, start, end)
+	t.Log(list)
+}

example/all-tx-syncer.go

@@ -8,7 +8,7 @@ import (
 // sync all arweave tx
 func main() {
 	nullFilterParams := arsyncer.FilterParams{} // non-file params
-	startHeight := int64(877360)
+	startHeight := int64(879220)
 	arNode := "https://arweave.net"
 	concurrencyNumber := 10 // runtime concurrency number, default 10
 	s := arsyncer.New(startHeight, nullFilterParams, arNode, concurrencyNumber, 15)

go.mod

@@ -10,4 +10,5 @@ require (
 	github.com/panjf2000/ants/v2 v2.4.6
 	github.com/pkg/errors v0.9.1 // indirect
 	gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect
+	gopkg.in/h2non/gentleman.v2 v2.0.5 // indirect
 )