aljaz/nigiri
1
0
Fork 0
mirror of https://github.com/aljazceru/nigiri.git synced 2025-12-17 06:14:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: use new tapd image (#181)

Browse Source
This commit is contained in:
Marco Argentieri
2023-06-01 10:58:50 +02:00
committed by GitHub
parent f84dbb3cf8
commit 04a21f8e9e
5 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
README.md
View File

@@ -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 `--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 ### Stop nigiri
@@ -171,8 +171,8 @@ el1qqwwx9gyrcrjrhgnrnjq9dq9t4hykmr6ela46ej63dnkdkcg8veadrvg5p0xg0zd6j3aug74cv9m4
$ nigiri cln listpeers $ nigiri cln listpeers
# LND # LND
$ nigiri lnd listpeers $ nigiri lnd listpeers
# Taro # Tap (Taro)
$ nigiri taro assets list $ nigiri tap assets list
``` ```
### Connect Core Lightning to LND ### Connect Core Lightning to LND

4
cmd/nigiri/main.go
View File

@@ -64,7 +64,7 @@ func main() {
&logs, &logs,
&mint, &mint,
&push, &push,
&taro, &tap,
&start, &start,
&update, &update,
&faucet, &faucet,
@@ -123,7 +123,7 @@ func provisionResourcesToDatadir(datadir string) error {
if err := makeDirectoryIfNotExists(filepath.Join(datadir, "volumes", "lightningd")); err != nil { if err := makeDirectoryIfNotExists(filepath.Join(datadir, "volumes", "lightningd")); err != nil {
return err return err
} }
if err := makeDirectoryIfNotExists(filepath.Join(datadir, "volumes", "taro")); err != nil { if err := makeDirectoryIfNotExists(filepath.Join(datadir, "volumes", "tapd")); err != nil {
return err return err
} }

10
cmd/nigiri/resources/docker-compose.yml
View File

@@ -167,7 +167,7 @@ services:
lnd: lnd:
container_name: lnd container_name: lnd
image: ghcr.io/vulpemventures/lnd image: ghcr.io/vulpemventures/lnd:v0.16.2-beta
user: 1000:1000 user: 1000:1000
depends_on: depends_on:
- bitcoin - bitcoin
@@ -182,15 +182,15 @@ services:
- "10009:10009" # grpc" - "10009:10009" # grpc"
- "18080:18080" # rest" - "18080:18080" # rest"
taro: tap:
container_name: taro container_name: tap
image: ghcr.io/vulpemventures/taro image: ghcr.io/vulpemventures/tapd:v0.2.0
user: 1000:1000 user: 1000:1000
depends_on: depends_on:
- bitcoin - bitcoin
- lnd - lnd
volumes: volumes:
- ./volumes/taro:/data/.taro - ./volumes/tapd:/data/.tapd
- ./volumes/lnd:/data/.lnd - ./volumes/lnd:/data/.lnd
environment: environment:
HOME: /data HOME: /data

4
cmd/nigiri/start.go
View File

@@ -49,7 +49,7 @@ func startAction(ctx *cli.Context) error {
if isLN { if isLN {
// LND // LND
servicesToRun = append(servicesToRun, "taro") servicesToRun = append(servicesToRun, "tap")
// Core Lightning Network // Core Lightning Network
servicesToRun = append(servicesToRun, "cln") servicesToRun = append(servicesToRun, "cln")
} }
@@ -64,7 +64,7 @@ func startAction(ctx *cli.Context) error {
// add also LN services if needed // add also LN services if needed
if isLN { if isLN {
// LND // LND
servicesToRun = append(servicesToRun, "taro") servicesToRun = append(servicesToRun, "tap")
// Core Lightning Network // Core Lightning Network
servicesToRun = append(servicesToRun, "cln") servicesToRun = append(servicesToRun, "cln")
} }

12
cmd/nigiri/taro.go → cmd/nigiri/tap.go
View File

@@ -8,13 +8,13 @@ import (
"github.com/urfave/cli/v2" "github.com/urfave/cli/v2"
) )
var taro = cli.Command{ var tap = cli.Command{
Name: "taro", Name: "tap",
Usage: "invoke taro command line interface", Usage: "invoke tap command line interface",
Action: taroAction, Action: tapAction,
} }
func taroAction(ctx *cli.Context) error { func tapAction(ctx *cli.Context) error {
if isRunning, _ := nigiriState.GetBool("running"); !isRunning { if isRunning, _ := nigiriState.GetBool("running"); !isRunning {
return errors.New("nigiri is not running") return errors.New("nigiri is not running")
@@ -34,7 +34,7 @@ func taroAction(ctx *cli.Context) error {
if isCi { if isCi {
ttyOption = "-i" 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()...) cmdArgs := append(rpcArgs, ctx.Args().Slice()...)
bashCmd := exec.Command("docker", cmdArgs...) bashCmd := exec.Command("docker", cmdArgs...)
bashCmd.Stdin = os.Stdin bashCmd.Stdin = os.Stdin