From 04a21f8e9e9b60614fe103c10b74736776bd2c7f Mon Sep 17 00:00:00 2001
From: Marco Argentieri <3596602+tiero@users.noreply.github.com>
Date: Thu, 1 Jun 2023 10:58:50 +0200
Subject: [PATCH] fix: use new tapd image (#181)

---
 README.md                               |  6 +++---
 cmd/nigiri/main.go                      |  4 ++--
 cmd/nigiri/resources/docker-compose.yml | 10 +++++-----
 cmd/nigiri/start.go                     |  4 ++--
 cmd/nigiri/{taro.go => tap.go}          | 12 ++++++------
 5 files changed, 18 insertions(+), 18 deletions(-)
 rename cmd/nigiri/{taro.go => tap.go} (72%)

diff --git a/README.md b/README.md
index 32cb7cf..64d5e98 100644
--- a/README.md
+++ b/README.md
@@ -74,7 +74,7 @@ $ nigiri start
 ```
 - Use the `--liquid` flag to let you do experiments with the Liquid sidechain. A liquid daemon and a block explorer are also started when passing this flag.
 
-- Use the `--ln` flag to start a Core Lightning node, a LND node and a Taro daemon.
+- Use the `--ln` flag to start a Core Lightning node, a LND node and a Tap daemon.
 
 ### Stop nigiri
 
@@ -171,8 +171,8 @@ el1qqwwx9gyrcrjrhgnrnjq9dq9t4hykmr6ela46ej63dnkdkcg8veadrvg5p0xg0zd6j3aug74cv9m4
 $ nigiri cln listpeers
 # LND
 $ nigiri lnd listpeers
-# Taro
-$ nigiri taro assets list
+# Tap (Taro)
+$ nigiri tap assets list
 ```
 
 ### Connect Core Lightning to LND
diff --git a/cmd/nigiri/main.go b/cmd/nigiri/main.go
index 3b5717b..53c2617 100644
--- a/cmd/nigiri/main.go
+++ b/cmd/nigiri/main.go
@@ -64,7 +64,7 @@ func main() {
 		&logs,
 		&mint,
 		&push,
-		&taro,
+		&tap,
 		&start,
 		&update,
 		&faucet,
@@ -123,7 +123,7 @@ func provisionResourcesToDatadir(datadir string) error {
 	if err := makeDirectoryIfNotExists(filepath.Join(datadir, "volumes", "lightningd")); err != nil {
 		return err
 	}
-	if err := makeDirectoryIfNotExists(filepath.Join(datadir, "volumes", "taro")); err != nil {
+	if err := makeDirectoryIfNotExists(filepath.Join(datadir, "volumes", "tapd")); err != nil {
 		return err
 	}
 
diff --git a/cmd/nigiri/resources/docker-compose.yml b/cmd/nigiri/resources/docker-compose.yml
index 0ebd2e1..3d0d489 100644
--- a/cmd/nigiri/resources/docker-compose.yml
+++ b/cmd/nigiri/resources/docker-compose.yml
@@ -167,7 +167,7 @@ services:
 
   lnd:
     container_name: lnd
-    image: ghcr.io/vulpemventures/lnd
+    image: ghcr.io/vulpemventures/lnd:v0.16.2-beta
     user: 1000:1000
     depends_on:
       - bitcoin
@@ -182,15 +182,15 @@ services:
       - "10009:10009" # grpc"
       - "18080:18080" # rest"
   
-  taro:
-    container_name: taro
-    image: ghcr.io/vulpemventures/taro
+  tap:
+    container_name: tap
+    image: ghcr.io/vulpemventures/tapd:v0.2.0
     user: 1000:1000
     depends_on:
       - bitcoin
       - lnd
     volumes:
-      - ./volumes/taro:/data/.taro
+      - ./volumes/tapd:/data/.tapd
       - ./volumes/lnd:/data/.lnd
     environment:
       HOME: /data
diff --git a/cmd/nigiri/start.go b/cmd/nigiri/start.go
index 7aa3ded..4b7ab17 100644
--- a/cmd/nigiri/start.go
+++ b/cmd/nigiri/start.go
@@ -49,7 +49,7 @@ func startAction(ctx *cli.Context) error {
 
 	if isLN {
 		// LND
-		servicesToRun = append(servicesToRun, "taro")
+		servicesToRun = append(servicesToRun, "tap")
 		// Core Lightning Network
 		servicesToRun = append(servicesToRun, "cln")
 	}
@@ -64,7 +64,7 @@ func startAction(ctx *cli.Context) error {
 		// add also LN services if needed
 		if isLN {
 			// LND
-			servicesToRun = append(servicesToRun, "taro")
+			servicesToRun = append(servicesToRun, "tap")
 			// Core Lightning Network
 			servicesToRun = append(servicesToRun, "cln")
 		}
diff --git a/cmd/nigiri/taro.go b/cmd/nigiri/tap.go
similarity index 72%
rename from cmd/nigiri/taro.go
rename to cmd/nigiri/tap.go
index 7a27e35..e43799b 100644
--- a/cmd/nigiri/taro.go
+++ b/cmd/nigiri/tap.go
@@ -8,13 +8,13 @@ import (
 	"github.com/urfave/cli/v2"
 )
 
-var taro = cli.Command{
-	Name:   "taro",
-	Usage:  "invoke taro command line interface",
-	Action: taroAction,
+var tap = cli.Command{
+	Name:   "tap",
+	Usage:  "invoke tap command line interface",
+	Action: tapAction,
 }
 
-func taroAction(ctx *cli.Context) error {
+func tapAction(ctx *cli.Context) error {
 
 	if isRunning, _ := nigiriState.GetBool("running"); !isRunning {
 		return errors.New("nigiri is not running")
@@ -34,7 +34,7 @@ func taroAction(ctx *cli.Context) error {
 	if isCi {
 		ttyOption = "-i"
 	}
-	rpcArgs := []string{"exec", ttyOption, "taro", "tarocli", "--network=" + network}
+	rpcArgs := []string{"exec", ttyOption, "tap", "tapcli", "--network=" + network, "--tapddir=/data/.tapd"}
 	cmdArgs := append(rpcArgs, ctx.Args().Slice()...)
 	bashCmd := exec.Command("docker", cmdArgs...)
 	bashCmd.Stdin = os.Stdin