Include description hash in phoenix backend.

Author: braydonf

lib/makeinvoice/makeinvoice.go

@@ -378,17 +378,24 @@ func MakeInvoice(params LNParams) (bolt11 string, err error) {
 		payload := url.Values{}
 
 		if params.Description != "" {
-			payload.Set("description", params.Description)
+			if params.UseDescriptionHash {
+				payload.Set("descriptionHash", hexh)
+			} else {
+				payload.Set("description", params.Description)
+			}
+
 		} else {
 			payload.Set("description", "created by makeinvoice")
 		}
 
 		payload.Add("amountSat", fmt.Sprintf("%d", params.Msatoshi/1000))
 
-		data := bytes.NewBufferString(payload.Encode())
-
 		client := &http.Client{}
-		req, err := http.NewRequest("POST", "http://"+backend.Host+"/createinvoice", data)
+		req, err := http.NewRequest(
+			"POST",
+			"http://"+backend.Host+"/createinvoice",
+			strings.NewReader(payload.Encode()),
+		)
 
 		if err != nil {
 			return "", err

makeinvoice.go

@@ -76,12 +76,11 @@ func makeInvoice(
 	// make the lnurlpay description_hash
 
 	if zap != "" {
+		mip.UseDescriptionHash = true
 		mip.Description = zap
 	} else if comment != "" {
-		mip.UseDescriptionHash = true
 		mip.Description = comment
 	} else {
-		mip.UseDescriptionHash = true
 		mip.Description = makeMetadata(params)
 	}
 

waitforinvoice.go

@@ -99,8 +99,8 @@ func WaitForInvoicePaid(payvalues LNURLPayValuesCustom, params *UserParams) {
 		}
 
 		Client.Transport = specialTransport
-		var maxiterations = 100
-		ticker := time.NewTicker(100 * time.Millisecond)
+		var maxiterations = 34
+		ticker := time.NewTicker(10 * time.Second)
 		quit := make(chan struct{})
 
 		for {