Release v0.4.0

.gitignore

@@ -1,17 +1,3 @@
-# Mac OS X finder
-.DS_Store
+libwallet/.gitignore# binary
+libwallet
 
-# Vim swap files
-*~
-.*.sw[a-z]
-
-# VS code
-.vscode
-
-# Goland
-.idea
-
-# Golang
-/bin
-/pkg
-/src

.vscode/launch.json

@@ -0,0 +1,17 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "Launch",
+            "type": "go",
+            "request": "launch",
+            "mode": "auto",
+            "program": "${fileDirname}",
+            "env": {},
+            "args": []
+        }
+    ]
+}

.vscode/settings.json

@@ -0,0 +1,5 @@
+{
+    "go.buildFlags": [
+        "-v"
+    ]
+}

address.go

@@ -9,8 +9,8 @@ import (
 
 	"github.com/btcsuite/btcd/txscript"
 	"github.com/btcsuite/btcutil"
-	"github.com/golang/protobuf/proto"
 	"github.com/pkg/errors"
+	"google.golang.org/protobuf/proto"
 )
 
 // These constants are here for clients usage.
@@ -92,11 +92,9 @@ const (
 // GetPaymentURI builds a MuunPaymentURI from text (Bitcoin Uri, Muun Uri or address) and a network
 func GetPaymentURI(rawInput string, network *Network) (*MuunPaymentURI, error) {
 
-	bitcoinUri := buildUriFromString(rawInput)
-
-	components, err := url.Parse(bitcoinUri)
-	if err != nil {
-		return nil, err
+	bitcoinUri, components := buildUriFromString(rawInput, bitcoinScheme)
+	if components == nil {
+		return nil, errors.Errorf("failed to parse uri %v", rawInput)
 	}
 
 	if components.Scheme != "bitcoin" {
@@ -224,11 +222,11 @@ func DoPaymentRequestCall(url string, network *Network) (*MuunPaymentURI, error)
 
 	return &MuunPaymentURI{
 		Address:      address,
-		Message:      *payDetails.Memo,
-		Amount:       strconv.FormatUint(*payDetails.Outputs[0].Amount, 10),
+		Message:      payDetails.Memo,
+		Amount:       strconv.FormatUint(payDetails.Outputs[0].Amount, 10),
 		BIP70Url:     url,
-		CreationTime: strconv.FormatUint(*payDetails.Time, 10),
-		ExpiresTime:  strconv.FormatUint(*payDetails.Expires, 10),
+		CreationTime: strconv.FormatUint(payDetails.Time, 10),
+		ExpiresTime:  strconv.FormatUint(payDetails.Expires, 10),
 	}, nil
 }
 
@@ -244,14 +242,19 @@ func getAddressFromScript(script []byte, network *Network) (string, error) {
 	return address.String(), nil
 }
 
-func buildUriFromString(rawInput string) string {
+func buildUriFromString(rawInput string, targetScheme string) (string, *url.URL) {
 	newUri := rawInput
 
-	newUri = strings.Replace(newUri, muunScheme, bitcoinScheme, 1)
+	newUri = strings.Replace(newUri, muunScheme, targetScheme, 1)
 
-	if !strings.Contains(newUri, bitcoinScheme) {
-		newUri = bitcoinScheme + rawInput
+	if !strings.HasPrefix(strings.ToLower(newUri), targetScheme) {
+		newUri = targetScheme + rawInput
+	}
+
+	components, err := url.Parse(newUri)
+	if err != nil {
+		return "", nil
 	}
 
-	return newUri
+	return newUri, components
 }

address_test.go

@@ -3,6 +3,7 @@ package libwallet
 import (
 	"encoding/hex"
 	"reflect"
+	"strings"
 	"testing"
 )
 
@@ -13,11 +14,11 @@ const (
 	uriWithSlashes = "bitcoin://" + amountURI
 
 	invalidAddress = "2NDhvuRPCYXq4fB8SprminieZ2a1i3JFXya"
+	randomText     = "fooo"
 
 	bip70URL                   = "https://bitpay.com/i/KXCEAtJQssR9vG2BxdjFwx"
 	bip70NonRetroCompatAddress = bitcoinScheme + "?r=" + bip70URL
 	bip70RetroCompatAddress    = bitcoinScheme + address + "?r=" + bip70URL
-
 )
 
 func TestGetPaymentURI(t *testing.T) {
@@ -89,6 +90,14 @@ func TestGetPaymentURI(t *testing.T) {
 			},
 			wantErr: true,
 		},
+		{
+			name: "randomText",
+			args: args{
+				address: randomText,
+				network: *Regtest(),
+			},
+			wantErr: true,
+		},
 		{
 			name: "BIP70NonRetroCompatAddress",
 			args: args{
@@ -164,6 +173,28 @@ func TestGetPaymentURI(t *testing.T) {
 				Description:     "",
 			}},
 		},
+		{
+			name: "ALL CAPS",
+			args: args{
+				address: "BITCOIN:BC1QSQP0D3TY8AAA8N9J8R0D2PF3G40VN4AS9TPWY3J9R3GK5K64VX6QWPAXH2",
+				network: *Mainnet(),
+			},
+			want: &MuunPaymentURI{
+				Address: strings.ToLower("BC1QSQP0D3TY8AAA8N9J8R0D2PF3G40VN4AS9TPWY3J9R3GK5K64VX6QWPAXH2"),
+				URI:     "BITCOIN:BC1QSQP0D3TY8AAA8N9J8R0D2PF3G40VN4AS9TPWY3J9R3GK5K64VX6QWPAXH2",
+			},
+		},
+		{
+			name: "MiXeD Case",
+			args: args{
+				address: "BiTcOiN:BC1QSQP0D3TY8AAA8N9J8R0D2PF3G40VN4AS9TPWY3J9R3GK5K64VX6QWPAXH2",
+				network: *Mainnet(),
+			},
+			want: &MuunPaymentURI{
+				Address: strings.ToLower("BC1QSQP0D3TY8AAA8N9J8R0D2PF3G40VN4AS9TPWY3J9R3GK5K64VX6QWPAXH2"),
+				URI:     "BiTcOiN:BC1QSQP0D3TY8AAA8N9J8R0D2PF3G40VN4AS9TPWY3J9R3GK5K64VX6QWPAXH2",
+			},
+		},
 	}
 
 	for _, tt := range tests {
@@ -186,7 +217,8 @@ func TestGetPaymentURI(t *testing.T) {
 
 func Test_normalizeAddress(t *testing.T) {
 	type args struct {
-		rawAddress string
+		rawAddress   string
+		targetScheme string
 	}
 	tests := []struct {
 		name string
@@ -196,28 +228,39 @@ func Test_normalizeAddress(t *testing.T) {
 		{
 			name: "normalAddress",
 			args: args{
-				rawAddress: address,
+				rawAddress:   address,
+				targetScheme: bitcoinScheme,
 			},
 			want: bitcoinScheme + address,
 		},
 		{
 			name: "bitcoinAddress",
 			args: args{
-				rawAddress: bitcoinScheme + address,
+				rawAddress:   bitcoinScheme + address,
+				targetScheme: bitcoinScheme,
 			},
 			want: bitcoinScheme + address,
 		},
 		{
 			name: "muunAddress",
 			args: args{
-				rawAddress: muunScheme + address,
+				rawAddress:   muunScheme + address,
+				targetScheme: bitcoinScheme,
 			},
 			want: bitcoinScheme + address,
 		},
+		{
+			name: "muun to lightning",
+			args: args{
+				rawAddress:   muunScheme + address,
+				targetScheme: lightningScheme,
+			},
+			want: lightningScheme + address,
+		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			if got := buildUriFromString(tt.args.rawAddress); got != tt.want {
+			if got, _ := buildUriFromString(tt.args.rawAddress, tt.args.targetScheme); got != tt.want {
 				t.Errorf("buildUriFromString() = %v, want %v", got, tt.want)
 			}
 		})

aes.go

@@ -8,10 +8,14 @@ import (
 	"github.com/pkg/errors"
 )
 
-func encrypt(key []byte, iv []byte, plaintext []byte) ([]byte, error) {
+const aesKeySize = 32
 
+func encryptAesCbcPkcs7(key []byte, iv []byte, plaintext []byte) ([]byte, error) {
 	plaintext = pkcs7Padding(plaintext)
+	return encryptAesCbcNoPadding(key, iv, plaintext)
+}
 
+func encryptAesCbcNoPadding(key []byte, iv []byte, plaintext []byte) ([]byte, error) {
 	block, err := aes.NewCipher(key)
 	if err != nil {
 		return nil, err
@@ -25,8 +29,17 @@ func encrypt(key []byte, iv []byte, plaintext []byte) ([]byte, error) {
 	return ciphertext, nil
 }
 
-func decrypt(key []byte, iv []byte, cypertext []byte) ([]byte, error) {
+func decryptAesCbcPkcs7(key []byte, iv []byte, cypertext []byte) ([]byte, error) {
+
+	paddedPlaintext, err := decryptAesCbcNoPadding(key, iv, cypertext)
+	if err != nil {
+		return nil, err
+	}
 
+	return pkcs7UnPadding(paddedPlaintext)
+}
+
+func decryptAesCbcNoPadding(key []byte, iv []byte, cypertext []byte) ([]byte, error) {
 	block, err := aes.NewCipher(key)
 	if err != nil {
 		return nil, err
@@ -37,11 +50,6 @@ func decrypt(key []byte, iv []byte, cypertext []byte) ([]byte, error) {
 	mode := cipher.NewCBCDecrypter(block, iv)
 	mode.CryptBlocks(plaintext, cypertext)
 
-	plaintext, err = pkcs7UnPadding(plaintext)
-	if err != nil {
-		return nil, err
-	}
-
 	return plaintext, nil
 }