Merge pull request #23 from everFinance/broadcast-txs

Broadcast txs

Author: zyjblockchain

README.md

@@ -91,6 +91,8 @@ fmt.Println(id, err) // {{id}}, nil
 - [x] GetBlockByHeight
 - [x] BatchSendItemToBundler
 - [x] GetBundle
+- [x] GetTxDataFromPeers
+- [x] BroadcastData
 
 Initialize the instance:
 
@@ -240,11 +242,10 @@ uploader, err := goar.CreateUploader(w.Client, tx, nil)
 if err != nil {
   return
 }
-for !uploader.IsComplete() {
-  err = uploader.UploadChunk()
-  if err != nil {
-    return
-  }
+
+err = uploader.Once()
+if err != nil {
+  return
 }
 ```
 
@@ -280,10 +281,7 @@ txId := "myTxId"
 // get uploader by txId and post big data by chunks
 uploader, err := goar.CreateUploader(wallet.Client, txId, bigData)
 assert.NoError(t, err)
-for !uploader.IsComplete() {
-  err := uploader.UploadChunk()
-  assert.NoError(t, err)
-}
+assert.NoError(t, uploader.Once())
 ```
 
 ##### NOTE: About all chunk transfer full example can be viewed in path `./example/chunks_tx_test.go`

client.go

@@ -75,7 +75,7 @@ func (c *Client) GetPeers() ([]string, error) {
 		fpeers = append(fpeers, p)
 	}
 
-	return peers[:], nil
+	return fpeers, nil
 }
 
 // GetTransactionByID status: Pending/Invalid hash/overspend
@@ -169,10 +169,13 @@ func (c *Client) GetTransactionData(id string, extension ...string) (body []byte
 	body, statusCode, err := c.httpGet(urlPath)
 
 	// When data is bigger than 12MiB statusCode == 400 NOTE: Data bigger than that has to be downloaded chunk by chunk.
-	if statusCode == 400 || len(body) == 0 {
+	if statusCode == 400 {
 		body, err = c.DownloadChunkData(id)
 		return
 	} else if statusCode == 200 {
+		if len(body) == 0 {
+			return c.DownloadChunkData(id)
+		}
 		return body, nil
 	} else if statusCode == 202 {
 		return nil, ErrPendingTx
@@ -189,6 +192,9 @@ func (c *Client) GetTransactionDataByGateway(id string) (body []byte, err error)
 	body, statusCode, err := c.httpGet(urlPath)
 	switch statusCode {
 	case 200:
+		if len(body) == 0 {
+			return c.DownloadChunkData(id)
+		}
 		return body, nil
 	case 400:
 		return c.DownloadChunkData(id)

client_broadcast.go

@@ -3,8 +3,6 @@ package goar
 import (
 	"errors"
 	"fmt"
-
-	"github.com/everFinance/sandy_log/log"
 )
 
 func (c *Client) GetTxDataFromPeers(txId string) ([]byte, error) {
@@ -15,11 +13,12 @@ func (c *Client) GetTxDataFromPeers(txId string) ([]byte, error) {
 
 	for _, peer := range peers {
 		pNode := NewClient("http://" + peer)
-		data, err := pNode.GetTransactionData(txId)
+		data, err := pNode.DownloadChunkData(txId)
 		if err != nil {
-			log.Error("get tx data failed", "error", err, "peer", peer)
+			fmt.Printf("get tx data error:%v, peer: %s\n", err, peer)
 			continue
 		}
+		fmt.Printf("success get tx data; peer: %s\n", peer)
 		return data, nil
 	}
 
@@ -34,26 +33,18 @@ func (c *Client) BroadcastData(txId string, data []byte, numOfNodes int64) error
 
 	count := int64(0)
 	for _, peer := range peers {
-
 		fmt.Printf("upload peer: %s, count: %d\n", peer, count)
 		arNode := NewClient("http://" + peer)
 		uploader, err := CreateUploader(arNode, txId, data)
 		if err != nil {
 			continue
 		}
 
-	Loop:
-		for !uploader.IsComplete() {
-			if err := uploader.UploadChunk(); err != nil {
-				break Loop
-			}
-			if uploader.LastResponseStatus != 200 {
-				break Loop
-			}
-		}
-		if uploader.IsComplete() { // upload success
-			count++
+		if err = uploader.Once(); err != nil {
+			continue
 		}
+
+		count++
 		if count >= numOfNodes {
 			return nil
 		}

client_test.go

@@ -201,25 +201,30 @@ func TestClient_GetPeers(t *testing.T) {
 	t.Log(len(peers))
 }
 
-// func Test_BroadcastData(t *testing.T) {
-// 	data := make([]byte, 1103732)
-// 	data[0] = byte('z')
-// 	data[1] = byte('y')
-// 	data[2] = byte('j')
-// 	for i := 3; i < len(data); i++ {
-// 		data[i] = byte('a')
-// 	}
-
-// 	cli := NewClient("https://arweave.net")
-// 	txId := "D3GOny9cItUEc8qAl1oLUtnoLOB3OfSB-wKbw8TUIRc"
-// 	err = cli.BroadcastData(txId, data, 1)
-// 	assert.NoError(t, err)
-// }
+func Test_GetTxDataFromPeers(t *testing.T) {
+	cli := NewClient("https://arweave.net")
+	txId := "J5FY1Ovd6JJ49WFHfCf-1wDM1TbaPSdKnGIB_8ePErE"
+	data, err := cli.GetTxDataFromPeers(txId)
 
-// func Test_GetTxDataFromPeers(t *testing.T) {
-// 	cli := NewClient("https://arweave.net")
-// 	txId := "D3GOny9cItUEc8qAl1oLUtnoLOB3OfSB-wKbw8TUIRc"
-// 	data, err := cli.GetTxDataFromPeers(txId)
-// 	assert.NoError(t, err)
-// 	assert.Equal(t, 1471643, len(data))
-// }
+	assert.NoError(t, err)
+
+	assert.NoError(t, err)
+	t.Log(len(data))
+
+	// verify data root
+	chunks := utils.GenerateChunks(data)
+	dataRoot := utils.Base64Encode(chunks.DataRoot)
+	tx, err := cli.GetTransactionByID(txId)
+	assert.NoError(t, err)
+	assert.Equal(t, tx.DataRoot, dataRoot)
+}
+
+func TestClient_BroadcastData(t *testing.T) {
+	cli := NewClient("https://arweave.net")
+	txId := "J5FY1Ovd6JJ49WFHfCf-1wDM1TbaPSdKnGIB_8ePErE"
+	data, err := cli.GetTransactionData(txId, "json")
+	assert.NoError(t, err)
+
+	err = cli.BroadcastData(txId, data, 20)
+	assert.NoError(t, err)
+}

example/chunks_tx_test.go

@@ -83,10 +83,7 @@ func Test_PostBigDataByChunks(t *testing.T) {
 	// uploader Transaction
 	uploader, err := goar.CreateUploader(wallet.Client, tx, nil)
 	assert.NoError(t, err)
-	for !uploader.IsComplete() {
-		err := uploader.UploadChunk()
-		assert.NoError(t, err)
-	}
+	assert.NoError(t, uploader.Once())
 }
 
 // test retry upload(断点重传) post big size data by tx id
@@ -127,10 +124,7 @@ func Test_RetryUploadDataByTxId(t *testing.T) {
 	// get uploader by txId and post big data by chunks
 	uploader, err := goar.CreateUploader(wallet.Client, tx.ID, bigData)
 	assert.NoError(t, err)
-	for !uploader.IsComplete() {
-		err := uploader.UploadChunk()
-		assert.NoError(t, err)
-	}
+	assert.NoError(t, uploader.Once())
 }
 
 // test continue upload(断点续传) big size data by last time uploader
@@ -171,10 +165,7 @@ func Test_ContinueUploadDataByLastUploader(t *testing.T) {
 	// new uploader object by last time uploader
 	newUploader, err := goar.CreateUploader(wallet.Client, lastUploader.FormatSerializedUploader(), bigData)
 	assert.NoError(t, err)
-	for !newUploader.IsComplete() {
-		err := newUploader.UploadChunk()
-		assert.NoError(t, err)
-	}
+	assert.NoError(t, newUploader.Once())
 
 	// end remove jsonUploaderFile.json file
 	_ = os.Remove("./jsonUploaderFile.json")

uploader.go

@@ -108,6 +108,20 @@ func CreateUploader(api *Client, upload interface{}, data []byte) (*TransactionU
 	return uploader, err
 }
 
+func (tt *TransactionUploader) Once() (err error) {
+	for !tt.IsComplete() {
+		if err = tt.UploadChunk(); err != nil {
+			return
+		}
+
+		if tt.LastResponseStatus != 200 {
+			return
+		}
+	}
+
+	return
+}
+
 func (tt *TransactionUploader) IsComplete() bool {
 	tChunks := tt.Transaction.Chunks
 	if tChunks == nil {

wallet.go

@@ -143,11 +143,6 @@ func (w *Wallet) SendTransaction(tx *types.Transaction) (id string, err error) {
 	if err != nil {
 		return
 	}
-	for !uploader.IsComplete() {
-		err = uploader.UploadChunk()
-		if err != nil {
-			return
-		}
-	}
+	err = uploader.Once()
 	return
 }

wallet_test.go

@@ -64,14 +64,18 @@ func TestWallet_SendAR(t *testing.T) {
 // test send small size file
 func TestWallet_SendDataSpeedUp01(t *testing.T) {
 	// arNode := "https://arweave.net"
-	// w, err := NewWalletFromPath("../example/testKey.json", arNode) // your wallet private key
+	// w, err := NewWalletFromPath("./example/testKey.json", arNode) // your wallet private key
 	// assert.NoError(t, err)
 	//
-	// data := []byte("aaa this is a goar test small size file data") // small file
+	// // data := []byte("aaa this is a goar test small size file data") // small file
+	// data := make([]byte, 255*1024)
+	// for i := 0; i < len(data); i++ {
+	// 	data[i] = byte('b' + i)
+	// }
 	// tags := []types.Tag{
 	// 	{Name: "GOAR", Value: "SMDT"},
 	// }
-	// id, err := w.SendDataSpeedUp(data, tags, 0)
+	// id, err := w.SendDataSpeedUp(data, tags, 50)
 	// assert.NoError(t, err)
 	// t.Logf("tx hash: %s", id)
 }