From f1652aad2fa6777a9a72d105693fb66893853616 Mon Sep 17 00:00:00 2001
From: fiatjaf <fiatjaf@alhur.es>
Date: Wed, 11 Aug 2021 14:01:16 -0300
Subject: [PATCH] update so it works with btcpayserver.

---
 Makefile                                | 2 +-
 go.mod                                  | 2 +-
 go.sum                                  | 4 ++--
 invoicewithdescriptionhash/cmd/Makefile | 2 +-
 invoicewithdescriptionhash/cmd/main.go  | 2 +-
 main.go                                 | 2 +-
 spark-wallet                            | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index e40e941..5c37eab 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 dist: $(shell find . -name "*.go") spark-wallet/client/dist
 	mkdir -p dist
-	gox -ldflags="-s -w" -osarch="darwin/amd64 linux/386 linux/amd64 linux/arm freebsd/amd64 openbsd/amd64" -output="dist/sparko_{{.OS}}_{{.Arch}}"
+	gox -ldflags="-s -w" -osarch="darwin/amd64 linux/386 linux/amd64 linux/arm linux/arm64 freebsd/amd64 openbsd/amd64" -output="dist/sparko_{{.OS}}_{{.Arch}}"
 
 sparko: $(shell find . -name "*.go") spark-wallet/client/dist/app.js
 	go build -o ./sparko
diff --git a/go.mod b/go.mod
index ee0237f..43554ef 100644
--- a/go.mod
+++ b/go.mod
@@ -5,7 +5,7 @@ go 1.16
 require (
 	github.com/NYTimes/gziphandler v1.1.1
 	github.com/fiatjaf/go-lnurl v1.2.0
-	github.com/fiatjaf/lightningd-gjson-rpc v1.0.1
+	github.com/fiatjaf/lightningd-gjson-rpc v1.4.0
 	github.com/gorilla/mux v1.7.4
 	github.com/gorilla/securecookie v1.1.1
 	github.com/rs/cors v1.7.0
diff --git a/go.sum b/go.sum
index 1f2d13a..3c00a38 100644
--- a/go.sum
+++ b/go.sum
@@ -68,8 +68,8 @@ github.com/elazarl/go-bindata-assetfs v1.0.0/go.mod h1:v+YaWX3bdea5J/mo8dSETolEo
 github.com/fiatjaf/go-lnurl v1.0.0/go.mod h1:BqA8WXAOzntF7Z3EkVO7DfP4y5rhWUmJ/Bu9KBke+rs=
 github.com/fiatjaf/go-lnurl v1.2.0 h1:3x2VYqQN1BIA+m67PhdWJR37PGWcPRZzWQX3BSLLPlY=
 github.com/fiatjaf/go-lnurl v1.2.0/go.mod h1:BqA8WXAOzntF7Z3EkVO7DfP4y5rhWUmJ/Bu9KBke+rs=
-github.com/fiatjaf/lightningd-gjson-rpc v1.0.1 h1:ERBKSzUyYm1WiFrPNr/TVTOJ8B9iotgG1END4DpelE4=
-github.com/fiatjaf/lightningd-gjson-rpc v1.0.1/go.mod h1:SQGA0qcY2qypaMXDQlE5V5+2MnLZzQ7NzfRsScliFeE=
+github.com/fiatjaf/lightningd-gjson-rpc v1.4.0 h1:Iv5tt4YuNoSMfR39wiV0tqnHYTJ85omAKuUXbBFvpt0=
+github.com/fiatjaf/lightningd-gjson-rpc v1.4.0/go.mod h1:SQGA0qcY2qypaMXDQlE5V5+2MnLZzQ7NzfRsScliFeE=
 github.com/fiatjaf/ln-decodepay v1.0.0 h1:1YUMjvLock+BicMNwoZ/OA3oG2ZYEaJ8AzdS6EGVMTQ=
 github.com/fiatjaf/ln-decodepay v1.0.0/go.mod h1:/LWK+ZUa3i8MqbRjIMAiVQS2+NbhwKWlwib2n446cMQ=
 github.com/frankban/quicktest v1.2.2/go.mod h1:Qh/WofXFeiAFII1aEBu529AtJo6Zg2VHscnEsbBnJ20=
diff --git a/invoicewithdescriptionhash/cmd/Makefile b/invoicewithdescriptionhash/cmd/Makefile
index 2256e5b..4b00ab8 100644
--- a/invoicewithdescriptionhash/cmd/Makefile
+++ b/invoicewithdescriptionhash/cmd/Makefile
@@ -1,6 +1,6 @@
 dist: $(shell find .. -name "*.go")
 	mkdir -p dist
-	gox -ldflags="-s -w" -osarch="darwin/amd64 linux/386 linux/amd64 linux/arm freebsd/amd64" -output="dist/invoicewithdescriptionhash_{{.OS}}_{{.Arch}}"
+	gox -ldflags="-s -w" -osarch="darwin/amd64 linux/386 linux/amd64 linux/arm linux/arm64 freebsd/amd64" -output="dist/invoicewithdescriptionhash_{{.OS}}_{{.Arch}}"
 
 invoicewithdescriptionhash: $(shell find . -name "*.go")
 	go build -o ./invoicewithdescriptionhash
diff --git a/invoicewithdescriptionhash/cmd/main.go b/invoicewithdescriptionhash/cmd/main.go
index 33a3795..5e33aa9 100644
--- a/invoicewithdescriptionhash/cmd/main.go
+++ b/invoicewithdescriptionhash/cmd/main.go
@@ -8,7 +8,7 @@ import (
 func main() {
 	p := plugin.Plugin{
 		Name:    "invoicewithdescriptionhash",
-		Version: "v1.0",
+		Version: "v1.2",
 		Options: []plugin.Option{},
 		RPCMethods: []plugin.RPCMethod{
 			invoicewithdescriptionhash.InvoiceWithDescriptionHashMethod,
diff --git a/main.go b/main.go
index 55dc9e8..5bc1d1c 100644
--- a/main.go
+++ b/main.go
@@ -32,7 +32,7 @@ var sparkWallet, _ = fs.Sub(static, "spark-wallet/client/dist")
 func main() {
 	p := plugin.Plugin{
 		Name:    "sparko",
-		Version: "v2.6",
+		Version: "v2.8",
 		Options: []plugin.Option{
 			{"sparko-host", "string", "127.0.0.1", "http(s) server listen address"},
 			{"sparko-port", "string", DEFAULTPORT, "http(s) server port"},
diff --git a/spark-wallet b/spark-wallet
index 47e6177..1548a8e 160000
--- a/spark-wallet
+++ b/spark-wallet
@@ -1 +1 @@
-Subproject commit 47e6177a1b5a3b532ecbf8d9e9c3c0111b131a5b
+Subproject commit 1548a8e858162c4dfcb4f572a135653f866feab5