add mini build

README.md

@@ -13,4 +13,21 @@ Need Go version 1.11
 ```sh
 cd $GOPATH/src/github.com/bytom-community/wasm
 GOOS=js GOARCH=wasm go build -o main.wasm
+GOOS=js GOARCH=wasm go build -tags=mini -o main.wasm #mini build
 ```
+
+
+## WebAssembly JS Function
+##### mini build
+>createKey\
+resetKeyPassword \
+signTransaction1
+
+##### default build
+>createKey \
+resetKeyPassword \
+createAccount \
+createAccountReceiver \
+signTransaction \
+signTransaction1
+

main.go

@@ -1,11 +1,9 @@
 package main
 
-import (
-	"github.com/bytom-community/wasm/sdk"
-)
+import "github.com/bytom-community/wasm/sdk/js"
 
 func main() {
 	done := make(chan struct{}, 0)
-	sdk.Register()
+	js.Register()
 	<-done
 }

sdk/key.go → sdk/base/key.go

@@ -1,13 +1,13 @@
-package sdk
+package base
 
 import (
-	"encoding/hex"
 	"syscall/js"
 
+	"github.com/bytom-community/wasm/sdk/lib"
+
 	"github.com/bytom-community/wasm/blockchain/pseudohsm"
 
 	"github.com/bytom-community/wasm/crypto/ed25519/chainkd"
-	"github.com/bytom-community/wasm/crypto/ed25519/ecmath"
 	"github.com/pborman/uuid"
 )
 
@@ -21,15 +21,15 @@ type XKey struct {
 }
 
 //createKey create bytom key
-func createKey(args []js.Value) {
-	defer endFunc(args[1]) //end func call
+func CreateKey(args []js.Value) {
+	defer lib.EndFunc(args[1]) //end func call
 	auth := args[0].Get("auth").String()
-	if isEmpty(auth) {
+	if lib.IsEmpty(auth) {
 		args[1].Set("error", "auth empty")
 		return
 	}
 	alias := args[0].Get("alias").String()
-	if isEmpty(alias) {
+	if lib.IsEmpty(alias) {
 		args[1].Set("error", "alias empty")
 		return
 	}
@@ -55,13 +55,13 @@ func createKey(args []js.Value) {
 	args[1].Set("data", string(keyjson))
 }
 
-func resetKeyPassword(args []js.Value) {
+func ResetKeyPassword(args []js.Value) {
 	rootXPub := args[0].Get("rootXPub").String()
 	oldPassword := args[0].Get("oldPassword").String()
 	newPassword := args[0].Get("newPassword").String()
-	if isEmpty(rootXPub) || isEmpty(oldPassword) || isEmpty(newPassword) {
+	if lib.IsEmpty(rootXPub) || lib.IsEmpty(oldPassword) || lib.IsEmpty(newPassword) {
 		args[1].Set("error", "empty pm")
-		endFunc(args[1])
+		lib.EndFunc(args[1])
 		return
 	}
 	xpub := new(chainkd.XPub)
@@ -70,7 +70,7 @@ func resetKeyPassword(args []js.Value) {
 	var then, catch js.Callback
 	then = js.NewCallback(func(a []js.Value) {
 		defer then.Release()
-		defer endFunc(args[1])
+		defer lib.EndFunc(args[1])
 		key, err := pseudohsm.DecryptKey([]byte(a[0].String()), oldPassword)
 		if err != nil {
 			args[1].Set("error", err.Error())
@@ -85,28 +85,8 @@ func resetKeyPassword(args []js.Value) {
 	})
 	catch = js.NewCallback(func(a []js.Value) {
 		defer catch.Release()
-		defer endFunc(args[1])
+		defer lib.EndFunc(args[1])
 		args[1].Set("error", a[0])
 	})
 	jsv.Call("then", then).Call("catch", catch)
 }
-
-//ScMulBase ed25519 scMulBase
-func scMulBase(args []js.Value) {
-	defer endFunc(args[1]) //end func call
-	b, err := hex.DecodeString(args[0].String())
-	if err != nil {
-		args[1].Set("error", err.Error())
-		return
-	}
-	if len(b) != 32 {
-		args[1].Set("error", "error byte len")
-		return
-	}
-	var scalar ecmath.Scalar
-	copy(scalar[:], b[:32])
-	var P ecmath.Point
-	P.ScMulBase(&scalar)
-	buf := P.Encode()
-	args[1].Set("data", hex.EncodeToString(buf[:]))
-}

sdk/transaction.go → sdk/base/transaction.go

@@ -1,25 +1,18 @@
-package sdk
+package base
 
 import (
-	"context"
 	"encoding/hex"
 	"encoding/json"
-	"errors"
 	"syscall/js"
 
+	"github.com/bytom-community/wasm/sdk/lib"
+
 	"github.com/bytom-community/wasm/blockchain/pseudohsm"
-	"github.com/bytom-community/wasm/blockchain/txbuilder"
-	"github.com/bytom-community/wasm/crypto/ed25519/chainkd"
 	chainjson "github.com/bytom-community/wasm/encoding/json"
 )
 
 const getKeyByXPub = "getKeyByXPub"
 
-type signResp struct {
-	Tx           *txbuilder.Template `json:"transaction"`
-	SignComplete bool                `json:"sign_complete"`
-}
-
 //Template server build struct
 type Template struct {
 	Transaction         string `json:"raw_transaction"`
@@ -35,12 +28,13 @@ type RespSign struct {
 	Signatures  [][]string `json:"signatures"`
 }
 
-func signTransaction1(args []js.Value) {
-	defer endFunc(args[1])
+//SignTransaction1 sign server transaction
+func SignTransaction1(args []js.Value) {
+	defer lib.EndFunc(args[1])
 	transaction := args[0].Get("transaction").String()
 	password := args[0].Get("password").String()
 	keyJSON := args[0].Get("key").String()
-	if isEmpty(transaction) || isEmpty(password) || isEmpty(keyJSON) {
+	if lib.IsEmpty(transaction) || lib.IsEmpty(password) || lib.IsEmpty(keyJSON) {
 		args[1].Set("error", "args empty")
 		return
 	}
@@ -86,40 +80,6 @@ func signTransaction1(args []js.Value) {
 	args[1].Set("data", string(j))
 }
 
-func signTransaction(args []js.Value) {
-	defer endFunc(args[1])
-	transaction := args[0].Get("transaction").String()
-	password := args[0].Get("password").String()
-	keys := args[0].Get("keys").String()
-	if isEmpty(transaction) || isEmpty(password) || isEmpty(keys) {
-		args[1].Set("error", "args empty")
-		return
-	}
-	var tx txbuilder.Template
-	err := json.Unmarshal([]byte(transaction), &tx)
-	if err != nil {
-		args[1].Set("error", err.Error())
-		return
-	}
-	keysMap := make(map[string]string)
-	err = json.Unmarshal([]byte(keys), &keysMap)
-	if err != nil {
-		args[1].Set("error", err.Error())
-		return
-	}
-	if err := txbuilder.Sign(nil, &tx, password, getSignFunc(keysMap)); err != nil {
-		args[1].Set("error", err.Error())
-		return
-	}
-	sr := signResp{Tx: &tx, SignComplete: txbuilder.SignProgress(&tx)}
-	resp, err := json.Marshal(sr)
-	if err != nil {
-		args[1].Set("error", err.Error())
-		return
-	}
-	args[1].Set("data", string(resp))
-}
-
 func signServer(keyJSON string, path [][]byte, data [32]byte, password string) ([]byte, error) {
 	var (
 		err error
@@ -137,26 +97,3 @@ func signServer(keyJSON string, path [][]byte, data [32]byte, password string) (
 	}
 	return xprv.Sign(data[:]), nil
 }
-
-func getSignFunc(keys map[string]string) txbuilder.SignFunc {
-	return func(ctx context.Context, xpub chainkd.XPub, path [][]byte, data [32]byte, password string) ([]byte, error) {
-		var (
-			err error
-			key *pseudohsm.XKey
-		)
-		if keys, ok := keys[xpub.String()]; ok {
-			key, err = pseudohsm.DecryptKey([]byte(keys), password)
-			if err != nil {
-				return nil, err
-			}
-
-			xprv := key.XPrv
-			if len(path) > 0 {
-				xprv = key.XPrv.Derive(path)
-			}
-			return xprv.Sign(data[:]), nil
-		}
-
-		return nil, errors.New("not found keys")
-	}
-}

sdk/js/register.go

@@ -0,0 +1,38 @@
+// +build !mini
+
+package js
+
+import (
+	"syscall/js"
+
+	"github.com/bytom-community/wasm/sdk/standard"
+
+	"github.com/bytom-community/wasm/sdk/base"
+)
+
+//RegisterFunc Register js func
+type RegisterFunc func(args []js.Value)
+
+var funcs map[string]RegisterFunc
+
+func init() {
+	funcs = make(map[string]RegisterFunc)
+
+	funcs["createKey"] = base.CreateKey
+	funcs["resetKeyPassword"] = base.ResetKeyPassword
+	funcs["createAccount"] = standard.CreateAccount
+	funcs["createAccountReceiver"] = standard.CreateAccountReceiver
+	funcs["signTransaction"] = standard.SignTransaction
+	funcs["signTransaction1"] = base.SignTransaction1
+}
+
+//Register Register func
+func Register() {
+	jsFuncVal := js.Global().Get("AllFunc")
+	for k, v := range funcs {
+		call := js.NewCallback(v)
+		jsFuncVal.Set(k, call)
+	}
+	setPrintMessage := js.Global().Get("setFuncOver")
+	setPrintMessage.Invoke()
+}

sdk/register.go → sdk/js/register_mini.go

@@ -1,6 +1,12 @@
-package sdk
+// +build mini
 
-import "syscall/js"
+package js
+
+import (
+	"syscall/js"
+
+	"github.com/bytom-community/wasm/sdk/base"
+)
 
 //RegisterFunc Register js func
 type RegisterFunc func(args []js.Value)
@@ -10,13 +16,9 @@ var funcs map[string]RegisterFunc
 func init() {
 	funcs = make(map[string]RegisterFunc)
 
-	funcs["scMulBase"] = scMulBase
-	funcs["createKey"] = createKey
-	funcs["resetKeyPassword"] = resetKeyPassword
-	funcs["createAccount"] = createAccount
-	funcs["createAccountReceiver"] = createAccountReceiver
-	funcs["signTransaction"] = signTransaction
-	funcs["signTransaction1"] = signTransaction1
+	funcs["createKey"] = base.CreateKey
+	funcs["resetKeyPassword"] = base.ResetKeyPassword
+	funcs["signTransaction1"] = base.SignTransaction1
 }
 
 //Register Register func

sdk/lib/lib.go

@@ -0,0 +1,16 @@
+package lib
+
+import "syscall/js"
+
+//EndFunc end call go func
+func EndFunc(value js.Value) {
+	value.Call("endFunc")
+}
+
+//IsEmpty js value check empty
+func IsEmpty(value string) bool {
+	if value == "" || value == "undefined" {
+		return true
+	}
+	return false
+}

sdk/account.go → sdk/standard/account.go

@@ -1,10 +1,12 @@
-package sdk
+package standard
 
 import (
 	"encoding/json"
 	"strings"
 	"syscall/js"
 
+	"github.com/bytom-community/wasm/sdk/lib"
+
 	"github.com/bytom-community/wasm/account"
 	"github.com/bytom-community/wasm/blockchain/signers"
 	"github.com/bytom-community/wasm/blockchain/txbuilder"
@@ -16,8 +18,9 @@ import (
 	"github.com/bytom-community/wasm/protocol/vm/vmutil"
 )
 
-func createAccount(args []js.Value) {
-	defer endFunc(args[1])
+//CreateAccount create account
+func CreateAccount(args []js.Value) {
+	defer lib.EndFunc(args[1])
 	var (
 		alias     string
 		quorum    int
@@ -53,8 +56,9 @@ func createAccount(args []js.Value) {
 	args[1].Set("data", string(rawAccount))
 }
 
-func createAccountReceiver(args []js.Value) {
-	defer endFunc(args[1])
+//CreateAccountReceiver create address by account
+func CreateAccountReceiver(args []js.Value) {
+	defer lib.EndFunc(args[1])
 	var (
 		acc       account.Account
 		err       error