add new wallet test

add new WalletTest func

diff --git a/blockchain/hsm.go b/blockchain/hsm.go
index 61ae9d2..9ca28c4 100644 (file)
--- a/blockchain/hsm.go
+++ b/blockchain/hsm.go
@@ -78,13 +78,13 @@ func (a *BlockchainReactor) pseudohsmDeleteKey(ctx context.Context,  x struct {
 }
 
 func (a *BlockchainReactor) pseudohsmSignTemplates(ctx context.Context,  x struct {
-       auth  string
+       Auth  string
        Txs   []*txbuilder.Template `json:"transactions"`
        XPubs []chainkd.XPub        `json:"xpubs"`
 }) []interface{} {
        resp := make([]interface{}, 0, len(x.Txs))
        for _, tx := range x.Txs {
-               err := txbuilder.Sign(ctx, tx, x.XPubs, x.auth, a.pseudohsmSignTemplate)
+               err := txbuilder.Sign(ctx, tx, x.XPubs, x.Auth, a.pseudohsmSignTemplate)
                if err != nil {
                        info := errorFormatter.Format(err)
                        resp = append(resp, info)

diff --git a/cmd/bytomcli/example/wallet.go b/cmd/bytomcli/example/wallet.go
index 7d07edb..984057a 100644 (file)
--- a/cmd/bytomcli/example/wallet.go
+++ b/cmd/bytomcli/example/wallet.go
@@ -3,8 +3,9 @@ package example
 import (
     "context"
     stdjson "encoding/json"
+    "encoding/hex"
     "fmt"
-    "time"
+    _"time"
 
     bc "github.com/bytom/blockchain"
     "github.com/bytom/blockchain/query"
@@ -12,11 +13,11 @@ import (
     "github.com/bytom/blockchain/txbuilder"
 
     "github.com/bytom/crypto/ed25519/chainkd"
-    "github.com/bytom/encoding/json"
+    _"github.com/bytom/encoding/json"
 )
 
 // TO DO: issue a asset to a account.
-func IssueTest(client *rpc.Client, args []string) {
+func WalletTest(client *rpc.Client, args []string) {
     // Create Account.
     /*
     fmt.Printf("To create Account:\n")
@@ -29,9 +30,10 @@ func IssueTest(client *rpc.Client, args []string) {
     xpub_account := new(chainkd.XPub)
     data, err := hex.DecodeString(xpub_str)
     if err != nil {
-        fatalln("error:  %v", err)
+        fmt.Printf("error:  %v", err)
     }
     copy(xpub_account[:], data)
+
     type Ins struct {
         RootXPubs   []chainkd.XPub `json:"root_xpubs"`
         Quorum      int
@@ -40,7 +42,7 @@ func IssueTest(client *rpc.Client, args []string) {
         ClientToken string `json:"client_token"`
     }
     var ins Ins
-    ins.RootXPubs = []chainkd.XPub{xpub_account}
+    ins.RootXPubs = []chainkd.XPub{*xpub_account}
     ins.Quorum = 1
     ins.Alias = "alice"
     ins.Tags = map[string]interface{}{"test_tag": "v0"}
@@ -84,7 +86,7 @@ func IssueTest(client *rpc.Client, args []string) {
         ]}`
     buildReqStr := fmt.Sprintf(buildReqFmt, asset[0].ID.String(), asset[0].ID.String(), account[0].ID)
     var buildReq bc.BuildRequest
-    err := stdjson.Unmarshal([]byte(buildReqStr), &buildReq)
+    err = stdjson.Unmarshal([]byte(buildReqStr), &buildReq)
     if err != nil {
         fmt.Printf("json Unmarshal error.")
     }
@@ -96,17 +98,16 @@ func IssueTest(client *rpc.Client, args []string) {
     // sign-transaction
     var response interface{}
     type Ins_tx struct {
-        Passwords []string
+        Auth string
         Txs   []*txbuilder.Template `json:"transactions"`
         XPubs []chainkd.XPub        `json:"xpubs"`
     }
     var tx Ins_tx
-    tx.Passwords = []string{"langyu"}
+    tx.Auth = "langyu"
     tx.Txs = []*txbuilder.Template{&tpl[0]}
-    tx.XPubs = []chainkd.XPub{xpub_account}
-
+    tx.XPubs = []chainkd.XPub{*xpub_account}
 
-    cient.Call(context.Background(), "/sign-transactions", &tx,  &response)
+    client.Call(context.Background(), "/sign-transactions", &tx,  &response)
    /*err = txbuilder.Sign(context.Background(), &tpl[0], []chainkd.XPub{xprv_asset.XPub()}, func(_ context.Context, _ chainkd.XPub, path [][]byte, data [32]byte) ([]byte, error) {
         derived := xprv_asset.Derive(path)
         return derived.Sign(data[:]), nil
@@ -127,93 +128,4 @@ func IssueTest(client *rpc.Client, args []string) {
     client.Call(context.Background(), "/submit-transaction", submitArg, &submitResponse)
     fmt.Printf("submit transaction:%v\n", submitResponse)
     */
-}
-
-/*
-func SpendTest(client *rpc.Client, args []string) {
-    // Create Account.
-    fmt.Printf("To create Account:\n")
-    xprv, _ := chainkd.NewXPrv(nil)
-    xpub := xprv.XPub()
-    fmt.Printf("xprv_account:%v\n", xprv)
-    fmt.Printf("xpub_account:%v\n", xpub)
-    type Ins struct {
-        RootXPubs   []chainkd.XPub `json:"root_xpubs"`
-        Quorum      int
-        Alias       string
-        Tags        map[string]interface{}
-        ClientToken string `json:"client_token"`
-    }
-    var ins Ins
-    ins.RootXPubs = []chainkd.XPub{xpub}
-    ins.Quorum = 1
-    ins.Alias = "alice"
-    ins.Tags = map[string]interface{}{"test_tag": "v0"}
-    ins.ClientToken = "account"
-    account := make([]query.AnnotatedAccount, 1)
-    client.Call(context.Background(), "/create-account", &[]Ins{ins}, &account)
-    fmt.Printf("account:%v\n", account)
-
-    // Create Asset.
-    fmt.Printf("To create Asset:\n")
-    xprv_asset, _ := chainkd.NewXPrv(nil)
-    xpub_asset := xprv_asset.XPub()
-    fmt.Printf("xprv_asset:%v\n", xprv_asset)
-    fmt.Printf("xpub_asset:%v\n", xpub_asset)
-    type Ins_asset struct {
-        RootXPubs   []chainkd.XPub `json:"root_xpubs"`
-        Quorum      int
-        Alias       string
-        Tags        map[string]interface{}
-        Definition  map[string]interface{}
-        ClientToken string `json:"client_token"`
-    }
-    var ins_asset Ins_asset
-    ins_asset.RootXPubs = []chainkd.XPub{xpub_asset}
-    ins_asset.Quorum = 1
-    ins_asset.Alias = "gold"
-    ins_asset.Tags = map[string]interface{}{"test_tag": "v0"}
-    ins_asset.Definition = map[string]interface{}{"test_definition": "v0"}
-    ins_asset.ClientToken = "asset"
-    asset := make([]query.AnnotatedAsset, 1)
-    client.Call(context.Background(), "/create-asset", &[]Ins_asset{ins_asset}, &asset)
-    fmt.Printf("asset:%v\n", asset)
-
-    // Build Transaction.
-    fmt.Printf("To build transaction:\n")
-    // Now spend actions
-    buildReqFmt := `
-        {"actions": [
-            {"type": "spend", "asset_id": "%s", "amount": 100},
-            {"type": "control_account", "asset_id": "%s", "amount": 100, "account_id": "%s"}
-        ]}`
-    buildReqStr := fmt.Sprintf(buildReqFmt, asset[0].ID.String(), asset[0].ID.String(), account[0].ID)
-    var buildReq bc.BuildRequest
-    err := stdjson.Unmarshal([]byte(buildReqStr), &buildReq)
-    if err != nil {
-        fmt.Printf("json Unmarshal error.")
-    }
-
-    tpl := make([]txbuilder.Template, 1)
-    client.Call(context.Background(), "/build-transaction", []*bc.BuildRequest{&buildReq}, &tpl)
-    fmt.Printf("tpl:%v\n", tpl)
-
-    /*  // sign-transaction
-        err = txbuilder.Sign(context.Background(), &tpl[0], []chainkd.XPub{xprv_asset.XPub()}, func(_ context.Context, _ chainkd.XPub, path [][]byte, data [32]byte) ([]byte, error) {
-            derived := xprv_asset.Derive(path)
-            return derived.Sign(data[:]), nil
-        })
-        if err != nil {
-            fmt.Printf("sign-transaction error. err:%v\n", err)
-        }
-        fmt.Printf("sign tpl:%v\n", tpl[0])
-        fmt.Printf("sign tpl's SigningInstructions:%v\n", tpl[0].SigningInstructions[0])
-        fmt.Printf("SigningInstructions's SignatureWitnesses:%v\n", tpl[0].SigningInstructions[0].SignatureWitnesses[0])
-
-        // submit-transaction
-        var submitResponse interface{}
-        submitArg := bc.SubmitArg{tpl, json.Duration{time.Duration(1000000)}, "none"}
-        client.Call(context.Background(), "/submit-transaction", submitArg, &submitResponse)
-        fmt.Printf("submit transaction:%v\n", submitResponse)
-    */
-}
+}
\ No newline at end of file