Merge pull request #3 from everFinance/optimate-api

feat(): optimate api

Author: outprog

client/client.go

@@ -65,12 +65,11 @@ func (c *Client) GetTransactionField(id string, field string) (f string, err err
 	return
 }
 
-func (c *Client) GetTransactionData(id string, extension string) (body []byte, err error) {
+func (c *Client) GetTransactionData(id string, extension ...string) (body []byte, err error) {
 	url := fmt.Sprintf("tx/%v/%v", id, "data")
-	if extension != "" {
-		url = url + "." + extension
+	if extension != nil {
+		url = url + "." + extension[0]
 	}
-
 	body, statusCode, err := c.httpGet(url)
 	if statusCode != 200 {
 		err = fmt.Errorf("not found data")

example/api_example_test.go

@@ -0,0 +1,124 @@
+package example
+
+import (
+	"fmt"
+	"github.com/everFinance/goar/client"
+	"github.com/everFinance/goar/types"
+	wallet2 "github.com/everFinance/goar/wallet"
+	"github.com/stretchr/testify/assert"
+	"testing"
+	"time"
+)
+
+func Test_Client(t *testing.T) {
+	// create client
+	arNode := "https://arweave.net"
+	c := client.New(arNode)
+	txId := "hKMMPNh_emBf8v_at1tFzNYACisyMQNcKzeeE1QE9p8"
+
+	// 1. getInfo
+	nodeInfo, err := c.GetInfo()
+	assert.NoError(t, err)
+	t.Logf("%v", nodeInfo)
+
+	// 2. full transaction via Id
+	tx, state, err := c.GetTransactionByID(txId)
+	assert.NoError(t, err)
+	t.Logf("state: %s", state)
+	t.Log(tx)
+
+	// 3. get transaction field by id
+	f, err := c.GetTransactionField(txId, "signature")
+	assert.NoError(t, err)
+	t.Log(f)
+
+	// 4. get transaction data
+	data, err := c.GetTransactionData(txId)
+	assert.NoError(t, err)
+	t.Log(string(data))
+	data, err = c.GetTransactionData(txId, "html")
+	assert.NoError(t, err)
+	t.Log(string(data))
+
+	// 5. get tx send current time reward
+	reward, err := c.GetTransactionPrice(data, nil)
+	assert.NoError(t, err)
+	t.Log(reward)
+	to := "1seRanklLU_1VTGkEk7P0xAwMJfA7owA1JHW5KyZKlY"
+	reward, err = c.GetTransactionPrice([]byte{}, &to)
+	assert.NoError(t, err)
+	t.Log(reward)
+
+	// 6. get anchor
+	anchor, err := c.GetTransactionAnchor()
+	assert.NoError(t, err)
+	t.Log(anchor)
+
+}
+
+func Test_client2(t *testing.T) {
+	arNode := "https://arweave.net"
+	wallet, err := wallet2.NewFromPath("./testKey.json", arNode)
+	assert.NoError(t, err)
+
+	tag := []types.Tag{
+		types.Tag{
+			Name:  "TokenSymbol",
+			Value: "DXN",
+		},
+		types.Tag{
+			Name:  "Version",
+			Value: "1.1.0",
+		},
+		types.Tag{
+			Name:  "CreatedBy",
+			Value: "ZYJ123",
+		},
+	}
+	// 连续发送5 笔交易来测试交易打包顺序
+	for i := 0; i < 5; i++ {
+		data := fmt.Sprintf("nonce: %d", i)
+		id, status, err := wallet.SendData([]byte(data), tag)
+		t.Log(id)
+		t.Log(status)
+		t.Log(err)
+		time.Sleep(30 * time.Second)
+	}
+}
+
+func Test_Arq(t *testing.T) {
+	arqStr := `{
+			"op": "and",
+			"expr1": {
+				"op": "equals",
+				"expr1": "TokenSymbol",
+				"expr2": "DXN"
+			},
+			"expr2": {
+				"op": "equals",
+				"expr1": "CreatedBy",
+				"expr2": "zhou yu ji"
+			}
+		}`
+	// create client
+	arNode := "https://arweave.net"
+	c := client.New(arNode)
+	ids, err := c.Arql(arqStr)
+	t.Log(len(ids))
+	assert.NoError(t, err)
+	sstr := make([]string, 0)
+	sstr = append(sstr, "a")
+	for _, val := range ids {
+		t.Log(val)
+	}
+
+	// 冒泡排序
+	for i := 0; i < len(ids); i++ {
+		for j := 1; j < len(ids)-i; j++ {
+			if ids[j] > ids[j-1] {
+				ids[j], ids[j-1] = ids[j-1], ids[j]
+			}
+		}
+	}
+	t.Log(ids)
+}

wallet/wallet.go

@@ -20,16 +20,16 @@ type Wallet struct {
 	Address string
 }
 
-func NewFromPath(path string) (*Wallet, error) {
+func NewFromPath(path string, clientUrl string) (*Wallet, error) {
 	b, err := ioutil.ReadFile(path)
 	if err != nil {
 		return nil, err
 	}
 
-	return New(b)
+	return New(b, clientUrl)
 }
 
-func New(b []byte) (w *Wallet, err error) {
+func New(b []byte, clientUrl string) (w *Wallet, err error) {
 	key, err := gojwk.Unmarshal(b)
 	if err != nil {
 		return
@@ -56,7 +56,7 @@ func New(b []byte) (w *Wallet, err error) {
 
 	addr := sha256.Sum256(pub.N.Bytes())
 	w = &Wallet{
-		Client:  client.New("https://arweave.net"),
+		Client:  client.New(clientUrl),
 		PubKey:  pub,
 		PrvKey:  prv,
 		Address: utils.Base64Encode(addr[:]),

wallet/wallet_test.go

@@ -11,6 +11,7 @@ var testWallet *Wallet
 var err error
 
 func init() {
+	clientUrl := "https://arweave.net"
 	testWallet, err = New([]byte(`{ "kty": "RSA",
 	"n":
 	 "nQ9iy1fRM2xrgggjHhN1xZUnOkm9B4KFsJzH70v7uLMVyDqfyIJEVXeJ4Jhk_8KpjzYQ1kYfnCMjeXnhTUfY3PbeqY4PsK5nTje0uoOe1XGogeGAyKr6mVtKPhBku-aq1gz7LLRHndO2tvLRbLwX1931vNk94bSfJPYgMfU7OXxFXbTdKU38W6u9ShoaJGgUQI1GObd_sid1UVniCmu7P-99XPkixqyacsrkHzBajGz1S7jGmpQR669KWE9Z0unvH0KSHxAKoDD7Q7QZO7_4ujTBaIFwy_SJUxzVV8G33xvs7edmRdiqMdVK5W0LED9gbS4dv_aee9IxUJQqulSqZphPgShIiGNl9TcL5iUi9gc9cXR7ISyavos6VGiem_A-S-5f-_OKxoeZzvgAQda8sD6jtBTTuM5eLvgAbosbaSi7zFYCN7zeFdB72OfvCh72ZWSpBMH3dkdxsKCDmXUXvPdDLEnnRS87-MP5RV9Z6foq_YSEN5MFTMDdo4CpFGYl6mWTP6wUP8oM3Mpz3-_HotwSZEjASvWtiff2tc1fDHulVMYIutd52Fis_FKj6K1fzpiDYVA1W3cV4P28Q1-uF3CZ8nJEa5FXchB9lFrXB4HvsJVG6LPSt-y2R9parGi1_kEc6vOYIesKspgZ0hLyIKtqpTQFiPgKRlyUc-WEn5E",
@@ -26,7 +27,9 @@ func init() {
 	"dq":
 	 "woDVvUZ64OAfbRNaZ_vFJHxVr6K5uppjFcYDq-h-57UMVClXMjhCxf3FIqrjnAuVAi0aSzcBXVMTT4S5pUC1iOkxoAsZdu_f0qCqRF7VojG5f8SkUxN3FuSZeSP7JESM3UGmgYUeTuIV9TnujXr92CctyST1GFv7FiRLxAYBUzdQGzPXkn9cn2GJmf0cSqVKgA2L5eGY5HxeoCes_DOh4oD_zTRjttQXzHidVbprhr43_Lx9By46hf_oCQVdf0eaaYfV9HnQW_UT_7c0FtNy8fskR2tk87ofU3Fs-MPO9PhdFonRniEiTTr0ylslk3zHahzLvjZsJG457ICWSUb8gQ",
 	"qi":
-	 "ENtqTq3iiDkeiyPWD7pNRfiwIJnY5Zf97yXakxe04usHXWKmZulllttqsDkfHOXkBxRxHxqqTgOLuRpNsLrpI5MAxs8uSl13A70LUzHldnE8ePgt0688UpoI5Iw9oV2RdF_LvSrsgpa-SeexXxbZqXWpDNeUxYt2S327cS8HmrnETKy9z9VoVFmCT6_NCnxOaOTwr67dPBnGnW7nT3499m_aqmikCNjcmkfYihED6S2jZBRHPaSDM7JPPyQSEyRkGjR4z9JzhLOvbJf8tDKSE00JXJClmbpX-5qRcNt0gcJy6ceYQs-c94I24yGpunMMSwGo2i1-sGNwH1wj5-gv1Q" }`))
+	 "ENtqTq3iiDkeiyPWD7pNRfiwIJnY5Zf97yXakxe04usHXWKmZulllttqsDkfHOXkBxRxHxqqTgOLuRpNsLrpI5MAxs8uSl13A70LUzHldnE8ePgt0688UpoI5Iw9oV2RdF_LvSrsgpa-SeexXxbZqXWpDNeUxYt2S327cS8HmrnETKy9z9VoVFmCT6_NCnxOaOTwr67dPBnGnW7nT3499m_aqmikCNjcmkfYihED6S2jZBRHPaSDM7JPPyQSEyRkGjR4z9JzhLOvbJf8tDKSE00JXJClmbpX-5qRcNt0gcJy6ceYQs-c94I24yGpunMMSwGo2i1-sGNwH1wj5-gv1Q" }`),
+		clientUrl)
+
 	if err != nil {
 		panic(err)
 	}