Merge pull request #17 from xinshuhao/master

修复cdp dex 签名错误bug
WaykiChain · Nov 19, 2019 · 54a3bc9 · 54a3bc9
2 parents 9fc0196 + dd99908
commit 54a3bc9
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 9 deletions.
diff --git a/WaykichainWallet.go b/WaykichainWallet.go
@@ -63,7 +63,8 @@ func CheckPrivateKey(privateKey string, netType int) (bool, error) {
 // netType: WAYKI_TESTNET or WAYKI_MAINTNET
 func GetAddressFromMnemonic(words string, netType int) (string, error) {
 	wordArr:=strings.Split(words," ")
-	if(len(wordArr)!=12){
+	isValid:=commons.IsMnemonicValid(words)
+	if(len(wordArr)!=12||!isValid){
 		return "", ERR_INVALID_MNEMONIC
 	}
 	address := commons.GetAddressFromMnemonic(words, commons.Network(netType))
@@ -74,7 +75,8 @@ func GetAddressFromMnemonic(words string, netType int) (string, error) {
 // netType: WAYKI_TESTNET or WAYKI_MAINTNET
 func GetPrivateKeyFromMnemonic(words string, netType int) (string, error) {
 	wordArr:=strings.Split(words," ")
-	if(len(wordArr)!=12){
+	isValid:=commons.IsMnemonicValid(words)
+	if(len(wordArr)!=12||!isValid){
 		return "", ERR_INVALID_MNEMONIC
 	}
 	privateKey := commons.GetPrivateKeyFromMnemonic(words, commons.Network(netType))

diff --git a/commons/WaykiCdpLiquidateTx.go b/commons/WaykiCdpLiquidateTx.go
@@ -52,7 +52,7 @@ func (tx WaykiCdpLiquidateTx) doSignTx(wifKey *btcutil.WIF) []byte {
 	if(tx.UserId!=nil){
 		writer.WriteUserId(tx.UserId)
 	}else if(tx.PubKey!=nil){
-		writer.WriteReverse(tx.PubKey)
+		writer.WritePubKeyId(tx.PubKey)
 	}
 	writer.WriteString(tx.FeeSymbol)
 	writer.WriteVarInt(int64(tx.Fees))

diff --git a/commons/WaykiCdpRedeemTx.go b/commons/WaykiCdpRedeemTx.go
@@ -51,7 +51,7 @@ func (tx WaykiCdpRedeemTx) doSignTx(wifKey *btcutil.WIF) []byte {
 	if(tx.UserId!=nil){
 		writer.WriteUserId(tx.UserId)
 	}else if(tx.PubKey!=nil){
-		writer.WriteReverse(tx.PubKey)
+		writer.WritePubKeyId(tx.PubKey)
 	}
 	writer.WriteString(tx.FeeSymbol)
 	writer.WriteVarInt(int64(tx.Fees))

diff --git a/commons/WaykiCdpStakeTx.go b/commons/WaykiCdpStakeTx.go
@@ -61,7 +61,7 @@ func (tx WaykiCdpStakeTx) doSignTx(wifKey *btcutil.WIF) []byte {
 	if(tx.UserId!=nil){
 		writer.WriteUserId(tx.UserId)
 	}else if(tx.PubKey!=nil){
-		writer.WriteReverse(tx.PubKey)
+		writer.WritePubKeyId(tx.PubKey)
 	}
 	writer.WriteString(tx.FeeSymbol)
 	writer.WriteVarInt(int64(tx.Fees))

diff --git a/commons/WaykiDexCancelTx.go b/commons/WaykiDexCancelTx.go
@@ -48,7 +48,7 @@ func (tx WaykiDexCancelTx) doSignTx(wifKey *btcutil.WIF) []byte {
 	if(tx.UserId!=nil){
 		writer.WriteUserId(tx.UserId)
 	}else if(tx.PubKey!=nil){
-		writer.WriteReverse(tx.PubKey)
+		writer.WritePubKeyId(tx.PubKey)
 	}
 	writer.WriteString(tx.FeeSymbol)
 	writer.WriteVarInt(int64(tx.Fees))

diff --git a/commons/WaykiDexLimitTx.go b/commons/WaykiDexLimitTx.go
@@ -55,7 +55,7 @@ func (tx WaykiDexSellLimitTx) doSignTx(wifKey *btcutil.WIF) []byte {
 	if(tx.UserId!=nil){
 		writer.WriteUserId(tx.UserId)
 	}else if(tx.PubKey!=nil){
-		writer.WriteReverse(tx.PubKey)
+		writer.WritePubKeyId(tx.PubKey)
 	}
 	writer.WriteString(tx.FeeSymbol)
 	writer.WriteVarInt(int64(tx.Fees))

diff --git a/commons/WaykiDexMarketTx.go b/commons/WaykiDexMarketTx.go
@@ -53,7 +53,7 @@ func (tx WaykiDexMarketTx) doSignTx(wifKey *btcutil.WIF) []byte {
 	if(tx.UserId!=nil){
 		writer.WriteUserId(tx.UserId)
 	}else if(tx.PubKey!=nil){
-		writer.WriteReverse(tx.PubKey)
+		writer.WritePubKeyId(tx.PubKey)
 	}
 	writer.WriteString(tx.FeeSymbol)
 	writer.WriteVarInt(int64(tx.Fees))

diff --git a/commons/WaykiUCoinTransferTx.go b/commons/WaykiUCoinTransferTx.go
@@ -61,7 +61,7 @@ func (tx WaykiUCoinTransferTx) doSignTx(wifKey *btcutil.WIF) []byte {
 	if(tx.UserId!=nil){
 		writer.WriteUserId(tx.UserId)
 	}else if(tx.PubKey!=nil){
-		writer.WriteReverse(tx.PubKey)
+		writer.WritePubKeyId(tx.PubKey)
 	}
 	writer.WriteString(tx.FeeSymbol)
 	writer.WriteVarInt(int64(tx.Fees))