Merge pull request #63 from everFinance/fix/encode-decode-tags

feat(): fix bundleItem tags encode and decode

Author: zyjblockchain

client_test.go

@@ -398,7 +398,7 @@ func TestClient_GetBundleItems3(t *testing.T) {
 }
 
 func TestNewClient2(t *testing.T) {
-	arTx := "b92IF6ZX0owPFcssPcs-qOBN2nuR0d3xLYOSovh1eck"
+	arTx := "FH95DEmWitTvg07vKUejh9akIPQKgZOp7ZdPa2adnGM"
 	c := NewClient("https://arweave.net")
 	data, err := c.GetTransactionDataByGateway(arTx)
 
@@ -411,6 +411,7 @@ func TestNewClient2(t *testing.T) {
 	for _, item := range bundleItems {
 		t.Log(item.Id)
 	}
+	t.Log(len(bundleItems))
 }
 
 func TestNewWallet2(t *testing.T) {

go.mod

@@ -26,11 +26,13 @@ require (
 	github.com/everFinance/ethrpc v1.0.4 // indirect
 	github.com/getsentry/sentry-go v0.11.0 // indirect
 	github.com/go-stack/stack v1.8.1 // indirect
+	github.com/golang/snappy v0.0.4 // indirect
 	github.com/google/uuid v1.3.0 // indirect
 	github.com/jinzhu/inflection v1.0.0 // indirect
 	github.com/jinzhu/now v1.1.4 // indirect
 	github.com/json-iterator/go v1.1.11 // indirect
 	github.com/kr/pretty v0.2.1 // indirect
+	github.com/linkedin/goavro/v2 v2.12.0 // indirect
 	github.com/mattn/go-colorable v0.1.11 // indirect
 	github.com/mattn/go-isatty v0.0.14 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect

utils/bundle.go

@@ -831,3 +831,24 @@ func SubmitItemToArSeed(item types.BundleItem, currency, arseedUrl string) (*sch
 	}
 	return br, nil
 }
+
+func SubmitItemToMU(item types.BundleItem, muUrl string) ([]byte, error) {
+	itemBinary := item.ItemBinary
+	if len(itemBinary) == 0 {
+		var err error
+		itemBinary, err = GenerateItemBinary(&item)
+		if err != nil {
+			return nil, err
+		}
+	}
+
+	resp, err := http.DefaultClient.Post(muUrl, "application/octet-stream", bytes.NewBuffer(itemBinary))
+	if err != nil {
+		return nil, err
+	}
+	defer resp.Body.Close()
+	fmt.Printf("resp code:%v\n", resp.StatusCode)
+	// json unmarshal
+	body, err := ioutil.ReadAll(resp.Body)
+	return body, err
+}

utils/tags.go

@@ -3,6 +3,7 @@ package utils
 import (
 	"github.com/everFinance/goar/types"
 	"github.com/hamba/avro"
+	"github.com/linkedin/goavro/v2"
 )
 
 func TagsEncode(tags []types.Tag) []types.Tag {
@@ -42,7 +43,7 @@ func TagsDecode(base64Tags []types.Tag) ([]types.Tag, error) {
 }
 
 // using bundle tx, avro serialize
-func SerializeTags(tags []types.Tag) ([]byte, error) {
+func SerializeTags1(tags []types.Tag) ([]byte, error) {
 	if len(tags) == 0 {
 		return make([]byte, 0), nil
 	}
@@ -55,7 +56,7 @@ func SerializeTags(tags []types.Tag) ([]byte, error) {
 	return avro.Marshal(tagsParser, tags)
 }
 
-func DeserializeTags(data []byte) ([]types.Tag, error) {
+func DeserializeTags1(data []byte) ([]types.Tag, error) {
 	tagsParser, err := avro.Parse(`{"type": "array", "items": {"type": "record", "name": "Tag", "fields": [{"name": "name", "type": "string"}, {"name": "value", "type": "string"}]}}`)
 	if err != nil {
 		return nil, err
@@ -64,3 +65,58 @@ func DeserializeTags(data []byte) ([]types.Tag, error) {
 	err = avro.Unmarshal(tagsParser, data, &tags)
 	return tags, err
 }
+
+const avroTagSchema = `{
+	"type": "array",
+	"items": {
+		"type": "record",
+		"name": "Tag",
+		"fields": [
+			{ "name": "name", "type": "bytes" },
+			{ "name": "value", "type": "bytes" }
+		]
+	}
+}`
+
+func SerializeTags(tags []types.Tag) ([]byte, error) {
+	if len(tags) == 0 {
+		return make([]byte, 0), nil
+	}
+
+	codec, err := goavro.NewCodec(avroTagSchema)
+	if err != nil {
+		return nil, err
+	}
+	avroTags := []map[string]interface{}{}
+	for _, tag := range tags {
+		m := map[string]interface{}{"name": []byte(tag.Name), "value": []byte(tag.Value)}
+		avroTags = append(avroTags, m)
+	}
+
+	data, err := codec.BinaryFromNative(nil, avroTags)
+	if err != nil {
+		return nil, err
+	}
+
+	return data, err
+}
+
+func DeserializeTags(data []byte) ([]types.Tag, error) {
+	codec, err := goavro.NewCodec(avroTagSchema)
+	if err != nil {
+		return nil, err
+	}
+
+	avroTags, _, err := codec.NativeFromBinary(data)
+	if err != nil {
+		return nil, err
+	}
+
+	tags := []types.Tag{}
+
+	for _, v := range avroTags.([]interface{}) {
+		tag := v.(map[string]interface{})
+		tags = append(tags, types.Tag{Name: string(tag["name"].([]byte)), Value: string(tag["value"].([]byte))})
+	}
+	return tags, err
+}

utils/tags_test.go

@@ -1,6 +1,7 @@
 package utils
 
 import (
+	"encoding/hex"
 	"testing"
 
 	"github.com/everFinance/goar/types"
@@ -44,7 +45,11 @@ func TestTags(t *testing.T) {
 }
 
 func TestSerializeTags(t *testing.T) {
-	by, err := SerializeTags([]types.Tag{})
+	tags := []types.Tag{{Name: "abc", Value: "123"}, {Name: "bbc", Value: "223"}}
+
+	by, err := SerializeTags(tags)
 	assert.NoError(t, err)
-	t.Log(len(by))
+	t.Log(hex.EncodeToString(by))
+	//   040661626306313233066262630632323300
+	// 03200661626306313233066262630632323300
 }