# update hardwallet

Author: MacOMNI

clientwallet/wallet.go

@@ -6,6 +6,7 @@ type CreateAccount struct {
 	Language string // 成功必定包含地址
 	Password string // 公钥
 }
+
 type WalletAccount struct {
 	Res       int    // 0 失败 1 成功
 	Address   string // 成功必定包含地址

clientwallet/walletmanager.go

@@ -13,27 +13,10 @@ func GenerateMnWallet(account *CreateAccount) bool {
 
 }
 func SignRawTransaction(signIn *SignInput) *SignResult {
-
 	json := signInputToJson(signIn)
 	fmt.Println(json)
-	// acc, err := hdwallet.SignRawTransaction(signInput, coinType)
-	// if err != nil {
-	// 	return &SignResult{
-	// 		Res:    0,
-	// 		Coin:   signIn.Coin,
-	// 		Symbol: signIn.Symbol,
-	// 		ErrMsg: err.Error(),
-	// 	}
-	// }
-	// return &SignResult{
-	// 	Res:    acc.Res,
-	// 	Coin:   signIn.Coin,
-	// 	Symbol: signIn.Symbol,
-	// 	RawTX:  acc.RawTX,
-	// 	ErrMsg: acc.ErrMsg,
-	// 	Params: acc.Params,
-	// }
-	return &SignResult{}
+	acc := device.BLESignRawTransaction(json)
+	return jsonToSignResult(acc)
 }
 func jsonToSignResult(jsonString string) *SignResult {
 	var signResult *SignResult

example/wallet_test.go

@@ -1,6 +1,7 @@
 package example
 
 import (
+	"encoding/json"
 	"fmt"
 	"hardwallet/clientwallet"
 	"testing"
@@ -19,4 +20,36 @@ func Test_GenerateMnWallet(t *testing.T) {
 
 func Test_SignRawTransation(t *testing.T) {
 
+	item1 := clientwallet.OutPutItem{
+
+		TxHash:   "fe6c982c3b8bcf50139a364a698395dbfa12093eb59c981ed11749d04f21aa1b",
+		Value:    25000000,
+		Vout:     1,
+		Pkscript: "76a914ce3208cbad0926f4110a1b9b3db444c269b90ca088ac",
+	}
+
+	outputs := []clientwallet.OutPutItem{item1}
+	// fmt.Println("ltc outputs: ", outputs)
+
+	jsonInputs, err := json.Marshal(outputs)
+	if err != nil {
+		//log.Fatal("Cannot encode to JSON ", err)
+		fmt.Println("outputs err: ", err.Error())
+
+	}
+
+	signIn := &clientwallet.SignInput{
+		Coin:     "btc",
+		Symbol:   "btc",
+		Amount:   10000,
+		Change:   25000000 - 10000 - 10000,
+		Fee:      10000,
+		SrcAddr:  "",
+		DestAddr: "",
+		Net:      "testnet",
+		Password: "123456",
+		Inputs:   jsonInputs,
+	}
+	signResult := clientwallet.SignRawTransaction(signIn)
+	fmt.Println(signResult)
 }

hardwallet/keystore.txt

@@ -1 +1 @@
-{"crypto":{"cipher":"aes-128-ctr","ciphertext":"bf03a19fd0214df3287a721edd2790a496602525d736bad682f109a61ae3e2b350580db4c6f6b5d9f8eb3ff0978a00637a929c80fb39b85d5f965c72d3d2d74a1be1cbb3884fae5178","cipherparams":{"iv":"15d46bbe942f96ecf8452432327d993b"},"kdf":"scrypt","kdfparams":{"dklen":32,"n":2048,"p":1,"r":8,"salt":"17d2913688c31a585af4c83919490f7a5b2269101f8a4810ed052355531b7694"},"mac":"7ed2e9460ddad7996ed21a48c62baa785d3e5166aa6b6ba3fd39e73be482d803"},"version":3}
+{"crypto":{"cipher":"aes-128-ctr","ciphertext":"f2e1fbe629eae961d1792f3bcdb6fd9d37fe2fdd3acc6a5cc0fd2f666320962d7763ff2ccc502f234baad19345eb1c38f6d8c719964623713c074237e0045715bf7e41ccb0e599f8ef0b502b921d865c","cipherparams":{"iv":"51aa0de349cfc315498bb8f2e0e44ccf"},"kdf":"scrypt","kdfparams":{"dklen":32,"n":2048,"p":1,"r":8,"salt":"a37844bff78a6c701235931d11be2af4e933bbea9ded5fc8d8c133237a7378c4"},"mac":"766093507f503fb585355916da4f6f76cf57557fb496098e28b64cfa5f98f70a"},"version":3}

hardwallet/option.go

@@ -67,6 +67,13 @@ func newOptions(opts ...Option) *Options {
 	return opt
 }
 
+// Mnemonic set to options
+func Mnemonic(m string) Option {
+	return func(o *Options) {
+		o.Mnemonic = m
+	}
+}
+
 // GetPath return path in bip44 style
 func (o *Options) GetPath() []uint32 {
 	return []uint32{
@@ -77,13 +84,6 @@ func (o *Options) GetPath() []uint32 {
 		o.AddressIndex,
 	}
 }
-func (o *Options) GetQTUMPath() []uint32 {
-	return []uint32{
-		o.CoinType,
-		DefaultAccount,
-		DefaultAccount,
-	}
-}
 
 // Params set to options
 func Params(p *chaincfg.Params) Option {

hardwallet/wallet.go

@@ -42,18 +42,17 @@ type OutPutItem struct {
 }
 
 type SignInput struct {
-	PrivateKey string //私钥
-	Coin       string // 主链币
-	Symbol     string // symbol
-	Amount     int64  //转账数量
-	Change     int64  //找零数量
-	Fee        int64  //交易费用
-	SrcAddr    string //转账地址
-	DestAddr   string //接受地址
-	Net        string
-	Inputs     []byte //Vin构造
-	Params     []byte //预留字段
-	Password   string // 密码
+	Coin     string // 主链币
+	Symbol   string // symbol
+	Amount   int64  //转账数量
+	Change   int64  //找零数量
+	Fee      int64  //交易费用
+	SrcAddr  string //转账地址
+	DestAddr string //接受地址
+	Net      string
+	Inputs   []byte //Vin构造
+	Params   []byte //预留字段
+	Password string // 密码
 
 	// GasLimit   int64  // gas数量
 	// GasPrice   int64  // gas价格

hardwallet/wallet_btc.go

@@ -61,6 +61,9 @@ func (c *btc) SignRawTransaction(signIn *SignInput) (*SignResult, error) {
 	if signIn.Net == "testnet" {
 		net = &chaincfg.TestNet3Params
 	}
+	c.key.opt.Params = net
+	signIn.SrcAddr, _ = c.GetAddress()
+	fmt.Println("SrcAddr = ", signIn.SrcAddr)
 	///////////////
 	dest_addr, err := btcutil.DecodeAddress(signIn.DestAddr, net)
 	if err != nil {
@@ -111,15 +114,13 @@ func (c *btc) SignRawTransaction(signIn *SignInput) (*SignResult, error) {
 		}
 		mtx.AddTxOut(output)
 	}
-	a, err := btcutil.DecodeWIF(signIn.PrivateKey)
-
 	for i, input := range vouts {
 		pk, _ := hex.DecodeString(input.Pkscript)
 		if err != nil {
 			return nil, err
 		}
 		//sigScript, err := txscript.SignatureScript(mtx, i, input.Value, pk, txscript.SigHashAll, a.PrivKey, true)
-		sigScript, err := txscript.SignatureScript(mtx, i, pk, txscript.SigHashAll, a.PrivKey, true)
+		sigScript, err := txscript.SignatureScript(mtx, i, pk, txscript.SigHashAll, c.GetKey().Private, true)
 		fmt.Println(hex.EncodeToString(sigScript))
 		if err != nil {
 			return nil, err

hardwallet/walletmanager.go

@@ -6,6 +6,16 @@ import (
 	"hardwallet/datazip"
 	"hardwallet/keystore"
 	"io/ioutil"
+	"strings"
+)
+
+var (
+	//	mnemonic = "boy video model trap novel debris clip father art era edit salute"
+	// ## 已经支持的 BTC ETH ONT BCH LTC QTUM Libra EOS HC
+	// ## 暂未支持的    *TRX
+	coinMap = map[string]uint32{
+		"btc": BTC,
+	}
 )
 
 func GenerateMnWallet(acczip string) bool {
@@ -19,7 +29,7 @@ func GenerateMnWallet(acczip string) bool {
 	if err != nil {
 		return false
 	}
-	fmt.Println("mnemonic = ", mnemonic)
+	//fmt.Println("mnemonic = ", mnemonic)
 	keystoreJson, err := keystore.EncryptKey(mnemonic, acc.Password, "")
 	if err != nil {
 		return false
@@ -32,10 +42,31 @@ func GenerateMnWallet(acczip string) bool {
 	return true
 }
 func HDSignRawTransaction(zip string) string {
-	//var signIn *SignInput
 	result := datazip.BLEDeviceDataUnzip(zip)
 	signIn := JsonToSignInput(result)
 	fmt.Println(signIn)
+	if coinType, ok := coinMap[strings.ToLower(signIn.Coin)]; ok {
+		switch coinType {
+		case BTC:
+			break
+		default:
+			break
+		}
+		signResult := &SignResult{
+			Res: 0,
+		}
+		keystoreJson, _ := readKeyStoreFile("../hardwallet/keystore.txt")
+		mnemonic, _ := keystore.DecryptKey(keystoreJson, signIn.Password, "")
+		master, _ := NewKey(
+			Mnemonic(mnemonic), CoinType(coinType),
+		)
+		master.Net = signIn.Net
+		wallet, _ := master.GetImportWallet(coinType)
+		fmt.Println(wallet)
+
+		return datazip.BLEDeviceDataZip(SignResultToJson(signResult))
+	}
+
 	signResult := &SignResult{
 		Res: 0,
 	}