Merge pull request #29 from everFinance/add-block-verify

Add block verify

Author: zyjblockchain

README.md

@@ -93,6 +93,9 @@ fmt.Println(id, err) // {{id}}, nil
 - [x] GetBundle
 - [x] GetTxDataFromPeers
 - [x] BroadcastData
+- [x] GetUnconfirmedTx
+- [x] GetPendingTxIds
+- [x] GetBlockHashList
 
 Initialize the instance:
 
@@ -149,6 +152,7 @@ Package for Arweave develop toolkit.
 - [x] GetSignatureData
 - [x] VerifyTransaction
 - [x] NewBundle
+- [x] GenerateIndepHash
 
 #### RSA Threshold Cryptography
 

client.go

@@ -371,8 +371,7 @@ func (c *Client) GetBlockByID(id string) (block *types.Block, err error) {
 	if code != 200 {
 		return nil, fmt.Errorf("get block by id error: %s", string(body))
 	}
-	block = &types.Block{}
-	err = json.Unmarshal(body, block)
+	block, err = utils.DecodeBlock(string(body))
 	return
 }
 
@@ -385,8 +384,7 @@ func (c *Client) GetBlockByHeight(height int64) (block *types.Block, err error)
 	if code != 200 {
 		return nil, fmt.Errorf("get block by height error: %s", string(body))
 	}
-	block = &types.Block{}
-	err = json.Unmarshal(body, block)
+	block, err = utils.DecodeBlock(string(body))
 	return
 }
 
@@ -527,3 +525,19 @@ func (c *Client) GetPendingTxIds() ([]string, error) {
 	}
 	return res, nil
 }
+
+func (c *Client) GetBlockHashList() ([]string, error) {
+	body, statusCode, err := c.httpGet("/hash_list")
+	if statusCode != 200 {
+		return nil, errors.New("get block hash list failed")
+	}
+	if err != nil {
+		return nil, err
+	}
+
+	res := make([]string, 0)
+	if err := json.Unmarshal(body, &res); err != nil {
+		return nil, err
+	}
+	return res, nil
+}

client_broadcast.go

@@ -51,7 +51,6 @@ func (c *Client) GetTxDataFromPeers(txId string, peers ...string) ([]byte, error
 		pNode.SetTempConnUrl("http://" + peer)
 		data, err := pNode.DownloadChunkData(txId)
 		if err != nil {
-			log.Error("get tx data", "err", err, "peer", peer)
 			continue
 		}
 		return data, nil
@@ -74,7 +73,6 @@ func (c *Client) GetBlockFromPeers(height int64, peers ...string) (*types.Block,
 		pNode.SetTempConnUrl("http://" + peer)
 		block, err := pNode.GetBlockByHeight(height)
 		if err != nil {
-			fmt.Printf("get block error:%v, peer: %s, height: %d\n", err, peer, height)
 			continue
 		}
 		fmt.Printf("success get block; peer: %s\n", peer)
@@ -98,7 +96,6 @@ func (c *Client) GetTxFromPeers(arId string, peers ...string) (*types.Transactio
 		pNode.SetTempConnUrl("http://" + peer)
 		tx, err := pNode.GetTransactionByID(arId)
 		if err != nil {
-			fmt.Printf("get tx error:%v, peer: %s, arTx: %s\n", err, peer, arId)
 			continue
 		}
 		fmt.Printf("success get tx; peer: %s, arTx: %s\n", peer, arId)
@@ -122,7 +119,6 @@ func (c *Client) GetUnconfirmedTxFromPeers(arId string, peers ...string) (*types
 		pNode.SetTempConnUrl("http://" + peer)
 		tx, err := pNode.GetUnconfirmedTx(arId)
 		if err != nil {
-			fmt.Printf("get tx error:%v, peer: %s, arTx: %s\n", err, peer, arId)
 			continue
 		}
 		fmt.Printf("success get unconfirmed tx; peer: %s, arTx: %s\n", peer, arId)

types/block.go

@@ -0,0 +1,37 @@
+package types
+
+type Block struct {
+	Nonce                    string        `json:"nonce"`
+	PreviousBlock            string        `json:"previous_block"`
+	Timestamp                int64         `json:"timestamp"`
+	LastRetarget             int64         `json:"last_retarget"`
+	Diff                     interface{}   `json:"diff"`
+	Height                   int64         `json:"height"`
+	Hash                     string        `json:"hash"`
+	IndepHash                string        `json:"indep_hash"`
+	Txs                      []string      `json:"txs"`
+	TxRoot                   string        `json:"tx_root"`
+	TxTree                   interface{}   `json:"tx_tree"`
+	HashList                 interface{}   `json:"hash_list"`
+	HashListMerkle           string        `json:"hash_list_merkle"`
+	WalletList               string        `json:"wallet_list"`
+	RewardAddr               string        `json:"reward_addr"`
+	Tags                     []interface{} `json:"tags"`
+	RewardPool               interface{}   `json:"reward_pool"` // always string
+	WeaveSize                interface{}   `json:"weave_size"`  // always string
+	BlockSize                interface{}   `json:"block_size"`  // always string
+	CumulativeDiff           interface{}   `json:"cumulative_diff"`
+	SizeTaggedTxs            interface{}   `json:"size_tagged_txs"`
+	Poa                      POA           `json:"poa"`
+	UsdToArRate              []string      `json:"usd_to_ar_rate"`
+	ScheduledUsdToArRate     []string      `json:"scheduled_usd_to_ar_rate"`
+	Packing25Threshold       string        `json:"packing_2_5_threshold"`
+	StrictDataSplitThreshold string        `json:"strict_data_split_threshold"`
+}
+
+type POA struct {
+	Option   string `json:"option"`
+	TxPath   string `json:"tx_path"`
+	DataPath string `json:"data_path"`
+	Chunk    string `json:"chunk"`
+}

types/types.go

@@ -12,24 +12,6 @@ type NetworkInfo struct {
 	NodeStateLatency int64  `json:"node_state_latency"`
 }
 
-type Block struct {
-	Nonce         string        `json:"nonce"`
-	PreviousBlock string        `json:"previous_block"`
-	Timestamp     int64         `json:"timestamp"`
-	LastRetarget  int64         `json:"last_retarget"`
-	Diff          interface{}   `json:"diff"`
-	Height        int64         `json:"height"`
-	Hash          string        `json:"hash"`
-	IndepHash     string        `json:"indep_hash"`
-	Txs           []string      `json:"txs"`
-	WalletList    string        `json:"wallet_list"`
-	RewardAddr    string        `json:"reward_addr"`
-	Tags          []interface{} `json:"tags"`
-	RewardPool    interface{}   `json:"reward_pool"`
-	WeaveSize     interface{}   `json:"weave_size"`
-	BlockSize     interface{}   `json:"block_size"`
-}
-
 type TransactionChunk struct {
 	Chunk    string `json:"chunk"`
 	DataPath string `json:"data_path"`

utils/block.go

@@ -0,0 +1,130 @@
+package utils
+
+import (
+	"encoding/json"
+	"fmt"
+	"github.com/everFinance/goar/types"
+	"strings"
+)
+
+const (
+	height_2_0 = int64(422250)
+	height_2_4 = int64(633720)
+	height_2_5 = int64(812970)
+)
+
+func GenerateIndepHash(b types.Block) string {
+	if b.Height < height_2_0 { // not support arweave v1.0
+		return b.IndepHash
+	}
+
+	bds := generateBlockDataSegment(b)
+	list := make([]interface{}, 0)
+	list = append(list, Base64Encode(bds))
+	list = append(list, b.Hash)
+	list = append(list, b.Nonce)
+	if b.Height >= height_2_4 {
+		list = append(list, poaToList(b.Poa))
+	}
+	hash := DeepHash(list)
+	return Base64Encode(hash[:])
+}
+
+func generateBlockDataSegment(b types.Block) []byte {
+	bdsBase := generateBlockDataSegmentBase(b)
+
+	list := make([]interface{}, 0)
+	list = append(list, Base64Encode(bdsBase))
+	list = append(list, Base64Encode([]byte(fmt.Sprintf("%d", b.Timestamp))))
+	list = append(list, Base64Encode([]byte(fmt.Sprintf("%d", b.LastRetarget))))
+	list = append(list, Base64Encode([]byte(fmt.Sprintf("%v", b.Diff))))
+	list = append(list, Base64Encode([]byte(fmt.Sprintf("%v", b.CumulativeDiff))))
+	list = append(list, Base64Encode([]byte(fmt.Sprintf("%v", b.RewardPool))))
+	list = append(list, b.WalletList)
+	list = append(list, b.HashListMerkle)
+	hash := DeepHash(list)
+	return hash[:]
+}
+
+func generateBlockDataSegmentBase(b types.Block) []byte {
+	props := make([]interface{}, 0)
+	props = append(props, Base64Encode([]byte(fmt.Sprintf("%d", b.Height))))
+	props = append(props, b.PreviousBlock)
+	props = append(props, b.TxRoot)
+	props = append(props, b.Txs)
+
+	props = append(props, Base64Encode([]byte(fmt.Sprintf("%v", b.BlockSize))))
+	props = append(props, Base64Encode([]byte(fmt.Sprintf("%v", b.WeaveSize))))
+
+	if b.RewardAddr == "unclaimed" {
+		props = append(props, Base64Encode([]byte("unclaimed")))
+	} else {
+		props = append(props, b.RewardAddr)
+	}
+	props = append(props, b.Tags)
+
+	endProps := make([]interface{}, 0)
+	if b.Height >= height_2_4 {
+		props2 := make([]interface{}, 0)
+		if b.Height >= height_2_5 {
+			RateDividend := b.UsdToArRate[0]
+			RateDivisor := b.UsdToArRate[1]
+
+			ScheduledRateDividend := b.ScheduledUsdToArRate[0]
+			ScheduledRateDivisor := b.ScheduledUsdToArRate[1]
+
+			props2 = append(props2, Base64Encode([]byte(fmt.Sprintf("%s", RateDividend))))
+			props2 = append(props2, Base64Encode([]byte(fmt.Sprintf("%s", RateDivisor))))
+			props2 = append(props2, Base64Encode([]byte(fmt.Sprintf("%s", ScheduledRateDividend))))
+			props2 = append(props2, Base64Encode([]byte(fmt.Sprintf("%s", ScheduledRateDivisor))))
+
+			props2 = append(props2, Base64Encode([]byte(fmt.Sprintf("%s", b.Packing25Threshold))))
+			props2 = append(props2, Base64Encode([]byte(fmt.Sprintf("%s", b.StrictDataSplitThreshold))))
+		}
+		endProps = append(props2, props...)
+	} else {
+		endProps = append(props, poaToList(b.Poa))
+	}
+
+	hash := DeepHash(endProps)
+	return hash[:]
+}
+
+func poaToList(poa types.POA) []string {
+	return []string{
+		Base64Encode([]byte(poa.Option)),
+		poa.TxPath,
+		poa.DataPath,
+		poa.Chunk,
+	}
+}
+
+func DecodeBlock(body string) (*types.Block, error) {
+	b := &types.Block{}
+	// json unmarshal exist number precision problem
+	decoder := json.NewDecoder(strings.NewReader(body))
+	decoder.UseNumber()
+	err := decoder.Decode(b)
+	if err != nil {
+		return nil, err
+	}
+	formatBlockFields(b)
+	return b, err
+}
+
+func formatBlockFields(b *types.Block) {
+	if _, ok := b.RewardPool.(string); !ok {
+		by, _ := json.Marshal(b.RewardPool)
+		b.RewardPool = string(by)
+	}
+
+	if _, ok := b.WeaveSize.(string); !ok {
+		by, _ := json.Marshal(b.WeaveSize)
+		b.WeaveSize = string(by)
+	}
+
+	if _, ok := b.BlockSize.(string); !ok {
+		by, _ := json.Marshal(b.BlockSize)
+		b.BlockSize = string(by)
+	}
+}