Merge pull request #34 from everFinance/add-signer

Add signer

Author: zyjblockchain

README.md

@@ -131,6 +131,16 @@ proxyUrl := "http://127.0.0.1:8001"
 arWallet := NewWalletFromPath("./keyfile.json", "https://arweave.net", proxyUrl)
 ```
 
+#### Signer
+
+- [x] SignTx
+- [x] SignMsg
+- [x] Owner
+
+```golang
+signer := goar.NewSignerFromPath("./keyfile.json")
+```
+
 #### Utils
 
 Package for Arweave develop toolkit.
@@ -241,7 +251,7 @@ tx := &types.Transaction{
 tx.LastTx = anchor
 tx.Owner = utils.Base64Encode(w.PubKey.N.Bytes())
 
-if err = utils.SignTransaction(tx, w.PubKey, w.PrvKey); err != nil {
+if err = utils.SignTransaction(tx, w.PubKey, w.Signer.PrvKey); err != nil {
   return
 }
 

example/chunks_tx_test.go

@@ -51,13 +51,14 @@ func assemblyDataTx(bigData []byte, wallet *goar.Wallet, tags []types.Tag) (*typ
 		return nil, err
 	}
 	tx.LastTx = anchor
-	tx.Owner = utils.Base64Encode(wallet.PubKey.N.Bytes())
+	tx.Owner = wallet.Owner()
 
 	signData, err := utils.GetSignatureData(tx)
 	if err != nil {
 		return nil, err
 	}
-	sign, err := utils.Sign(signData, wallet.PrvKey)
+
+	sign, err := wallet.Signer.SignMsg(signData)
 	if err != nil {
 		return nil, err
 	}
@@ -172,9 +173,9 @@ func Test_ContinueUploadDataByLastUploader(t *testing.T) {
 }
 
 func Test_aa(t *testing.T) {
-	t.Log("address: ", wallet.Address)
+	t.Log("address: ", wallet.Signer.Address)
 
-	ownerBy := wallet.PubKey.N.Bytes()
+	ownerBy := wallet.Signer.PubKey.N.Bytes()
 	t.Log("length: ", len(ownerBy))
 	owner := utils.Base64Encode(ownerBy)
 	t.Log("owner:", owner)

signer.go

@@ -0,0 +1,69 @@
+package goar
+
+import (
+	"crypto/rsa"
+	"crypto/sha256"
+	"fmt"
+	"github.com/everFinance/goar/types"
+	"github.com/everFinance/goar/utils"
+	"github.com/everFinance/gojwk"
+	"io/ioutil"
+)
+
+type Signer struct {
+	Address string
+	PubKey  *rsa.PublicKey
+	PrvKey  *rsa.PrivateKey
+}
+
+func NewSignerFromPath(path string) (*Signer, error) {
+	b, err := ioutil.ReadFile(path)
+	if err != nil {
+		return nil, err
+	}
+	return NewSigner(b)
+}
+
+func NewSigner(b []byte) (*Signer, error) {
+	key, err := gojwk.Unmarshal(b)
+	if err != nil {
+		return nil, err
+	}
+	pubKey, err := key.DecodePublicKey()
+	if err != nil {
+		return nil, err
+	}
+	pub, ok := pubKey.(*rsa.PublicKey)
+	if !ok {
+		err = fmt.Errorf("pubKey type error")
+		return nil, err
+	}
+
+	prvKey, err := key.DecodePrivateKey()
+	if err != nil {
+		return nil, err
+	}
+	prv, ok := prvKey.(*rsa.PrivateKey)
+	if !ok {
+		err = fmt.Errorf("prvKey type error")
+		return nil, err
+	}
+	addr := sha256.Sum256(pub.N.Bytes())
+	return &Signer{
+		Address: utils.Base64Encode(addr[:]),
+		PubKey:  pub,
+		PrvKey:  prv,
+	}, nil
+}
+
+func (s *Signer) SignTx(tx *types.Transaction) error {
+	return utils.SignTransaction(tx, s.PrvKey)
+}
+
+func (s *Signer) Owner() string {
+	return utils.Base64Encode(s.PubKey.N.Bytes())
+}
+
+func (s *Signer) SignMsg(msg []byte) ([]byte, error) {
+	return utils.Sign(msg, s.PrvKey)
+}

signer_test.go

@@ -0,0 +1,35 @@
+package goar
+
+import (
+	"github.com/everFinance/goar/types"
+	"github.com/everFinance/goar/utils"
+	"github.com/stretchr/testify/assert"
+	"testing"
+)
+
+func TestNewSigner(t *testing.T) {
+	signer, err := NewSignerFromPath("./example/testKey.json")
+	assert.NoError(t, err)
+	tags := []types.Tag{
+		{Name: "GOAR", Value: "sendAR"},
+	}
+	tx := &types.Transaction{
+		Format:    2,
+		ID:        "EyPNVxI-zv1WGjiMmeb20VimIGjfvnkFQtgVnlSMX1o",
+		LastTx:    "0cJJGyXdeIJ-azX3I-jJ3XJEIYti-_qjHZhaRsXQxi1D3wXQVv6Px5WQhj_j1W8O",
+		Owner:     "zu2HnkLgrxsqqtdOzsSx6qezj8ujqYzJCaz9r6XosF5oHRdyqyxZFmuFeQaWS9_8YP73XFDUn2FJRNMzd6lclbIlgfiorufLfa6ez_4Y3yMVfYC56anQs0f62TwfcMuQCfTnPyPDds3evODLLRyuwVqtfe6jLZZ4LGbcgXySi0Hn184VxOTkDzvYz3zWz0tqpXX2T8qNeELNHH-j6pXMH7LNzU2akZhZUeuxsstxyedaZOP_EUwx-BtooWXWcVNcjM_elMitgZelU60J012AdgUXuj9kULxT78_BSFhiD4vGn5ZN8V1lpB410wGqQNuiGZGjUrorY9zmm3IDIhywxJrzcaTshxPBb8-gw-38mCOTP0yp4URs4lae75fxrD-m4kXzKl27XZ10K21U47W0hdJI1s934MPpuLudyvlXbxkvm19LzZj9wkmqf08RqghMS5X_LVgAT0bs6UMnLoJcQFckBWpOVDVY-spkPqxBhEomhDD3C9xvXz5KqR8Q9kgjX6nSXyn5svAsGGviHBzU27FtR9L01q6QCeCUEehCG_n0eVM4IsHIySh7ZZk1sFjBvgEEXiEpxA-av5ob2nfcR93cWILlhmPs4wdfzi8Q52jM2hShZXTYGvAOEdXdZmBatoVgm9Sca6U-pffmFqYl2BM-Bq_OjBpDnGvvQBV_990",
+		Tags:      utils.TagsEncode(tags),
+		Target:    "cSYOy8-p1QFenktkDBFyRM3cwZSTrQ_J4EsELLho_UE",
+		Quantity:  "1000000000",
+		Data:      "",
+		DataSize:  "0",
+		DataRoot:  "",
+		Reward:    "747288",
+		Signature: "",
+	}
+	err = signer.SignTx(tx)
+	assert.NoError(t, err)
+
+	err = utils.VerifyTransaction(*tx)
+	assert.NoError(t, err)
+}

wallet.go

@@ -1,8 +1,6 @@
 package goar
 
 import (
-	"crypto/rsa"
-	"crypto/sha256"
 	"errors"
 	"fmt"
 	"io/ioutil"
@@ -12,14 +10,11 @@ import (
 
 	"github.com/everFinance/goar/types"
 	"github.com/everFinance/goar/utils"
-	"github.com/everFinance/gojwk"
 )
 
 type Wallet struct {
-	Client  *Client
-	PubKey  *rsa.PublicKey
-	PrvKey  *rsa.PrivateKey
-	Address string
+	Client *Client
+	Signer *Signer
 }
 
 // proxyUrl: option
@@ -33,43 +28,21 @@ func NewWalletFromPath(path string, clientUrl string, proxyUrl ...string) (*Wall
 }
 
 func NewWallet(b []byte, clientUrl string, proxyUrl ...string) (w *Wallet, err error) {
-	key, err := gojwk.Unmarshal(b)
+	signer, err := NewSigner(b)
 	if err != nil {
-		return
-	}
-
-	pubKey, err := key.DecodePublicKey()
-	if err != nil {
-		return
-	}
-	pub, ok := pubKey.(*rsa.PublicKey)
-	if !ok {
-		err = fmt.Errorf("pubKey type error")
-		return
-	}
-	prvKey, err := key.DecodePrivateKey()
-	if err != nil {
-		return
-	}
-	prv, ok := prvKey.(*rsa.PrivateKey)
-	if !ok {
-		err = fmt.Errorf("prvKey type error")
-		return
+		return nil, err
 	}
 
-	addr := sha256.Sum256(pub.N.Bytes())
 	w = &Wallet{
-		Client:  NewClient(clientUrl, proxyUrl...),
-		PubKey:  pub,
-		PrvKey:  prv,
-		Address: utils.Base64Encode(addr[:]),
+		Client: NewClient(clientUrl, proxyUrl...),
+		Signer: signer,
 	}
 
 	return
 }
 
 func (w *Wallet) Owner() string {
-	return utils.Base64Encode(w.PubKey.N.Bytes())
+	return w.Signer.Owner()
 }
 
 func (w *Wallet) SendAR(amount *big.Float, target string, tags []types.Tag) (types.Transaction, error) {
@@ -136,7 +109,7 @@ func (w *Wallet) SendTransaction(tx *types.Transaction) (types.Transaction, erro
 	}
 	tx.LastTx = anchor
 	tx.Owner = w.Owner()
-	if err = utils.SignTransaction(tx, w.PrvKey); err != nil {
+	if err = w.Signer.SignTx(tx); err != nil {
 		return types.Transaction{}, err
 	}
 

wallet_bundle.go

@@ -11,7 +11,7 @@ import (
 func (w *Wallet) CreateAndSignBundleItem(data []byte, signatureType int, target string, anchor string, tags []types.Tag) (di types.BundleItem, err error) {
 	bundleItem := utils.NewBundleItem(w.Owner(), strconv.Itoa(signatureType), target, anchor, data, tags)
 	// sign
-	err = utils.SignBundleItem(bundleItem, w.PrvKey)
+	err = utils.SignBundleItem(bundleItem, w.Signer.PrvKey)
 	if err != nil {
 		return di, err
 	}

wallet_test.go

@@ -36,22 +36,22 @@ func init() {
 }
 
 func TestPubKey(t *testing.T) {
-	pubKey := testWallet.PubKey
+	pubKey := testWallet.Signer.PubKey
 	assert.Equal(t, "nQ9iy1fRM2xrgggjHhN1xZUnOkm9B4KFsJzH70v7uLMVyDqfyIJEVXeJ4Jhk_8KpjzYQ1kYfnCMjeXnhTUfY3PbeqY4PsK5nTje0uoOe1XGogeGAyKr6mVtKPhBku-aq1gz7LLRHndO2tvLRbLwX1931vNk94bSfJPYgMfU7OXxFXbTdKU38W6u9ShoaJGgUQI1GObd_sid1UVniCmu7P-99XPkixqyacsrkHzBajGz1S7jGmpQR669KWE9Z0unvH0KSHxAKoDD7Q7QZO7_4ujTBaIFwy_SJUxzVV8G33xvs7edmRdiqMdVK5W0LED9gbS4dv_aee9IxUJQqulSqZphPgShIiGNl9TcL5iUi9gc9cXR7ISyavos6VGiem_A-S-5f-_OKxoeZzvgAQda8sD6jtBTTuM5eLvgAbosbaSi7zFYCN7zeFdB72OfvCh72ZWSpBMH3dkdxsKCDmXUXvPdDLEnnRS87-MP5RV9Z6foq_YSEN5MFTMDdo4CpFGYl6mWTP6wUP8oM3Mpz3-_HotwSZEjASvWtiff2tc1fDHulVMYIutd52Fis_FKj6K1fzpiDYVA1W3cV4P28Q1-uF3CZ8nJEa5FXchB9lFrXB4HvsJVG6LPSt-y2R9parGi1_kEc6vOYIesKspgZ0hLyIKtqpTQFiPgKRlyUc-WEn5E", base64.RawURLEncoding.EncodeToString(pubKey.N.Bytes()))
 }
 
 func TestAddress(t *testing.T) {
-	addr := testWallet.Address
+	addr := testWallet.Signer.Address
 	assert.Equal(t, "eIgnDk4vSKPe0lYB6yhCHDV1dOw3JgYHGocfj7WGrjQ", addr)
 }
 
 // test sand ar without data
 func TestWallet_SendAR(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)
 	//
-	// target := "Goueytjwney8mRqbWBwuxbk485svPUWxFQojteZpTx8"
+	// target := "cSYOy8-p1QFenktkDBFyRM3cwZSTrQ_J4EsELLho_UE"
 	// amount := big.NewFloat(0.001)
 	// tags := []types.Tag{
 	// 	{Name: "GOAR", Value: "sendAR"},