Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Added Liquid.coach to nigiri #103

Closed
wants to merge 5 commits into from
Closed

Added Liquid.coach to nigiri #103

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1cc3d05
added coach
francismars Oct 21, 2020
20daf94
change in constants
francismars Oct 21, 2020
cc83b4e
underscore instead of dash
francismars Oct 21, 2020
d0a0853
exposed liquid_coach port on compose
francismars Nov 27, 2020
851d9d6
changed coach port env var name
francismars Nov 27, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions cli/constants/constants.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ var (
"vulpemventures/nigiri-chopsticks:latest",
"vulpemventures/liquid:latest",
"vulpemventures/electrs-liquid:latest",
"vulpemventures/liquid-coach:latest",
}
DefaultEnv = map[string]interface{}{
"ports": map[string]map[string]int{
Expand All @@ -38,17 +39,19 @@ var (
"chopsticks": 3000,
},
"liquid": map[string]int{
"peer": 7040,
"node": 7041,
"esplora": 5001,
"electrs": 3012,
"electrs_rpc": 60401,
"chopsticks": 3001,
"peer": 7040,
"node": 7041,
"esplora": 5001,
"electrs": 3012,
"electrs_rpc": 60401,
"chopsticks": 3001,
"liquid_coach": 7000,
},
},
"urls": map[string]string{
"bitcoin_esplora": "http://localhost:3000",
"liquid_esplora": "http://localhost:3001",
"liquid_coach": "http://localhost:7000",
},
}

Expand Down
9 changes: 5 additions & 4 deletions cli/controller/controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,11 @@ import (
)

var Services = map[string]bool{
"node": true,
"esplora": true,
"electrs": true,
"chopsticks": true,
"node": true,
"esplora": true,
"electrs": true,
"chopsticks": true,
"liquid_coach": true,
}

// Controller implements useful functions to securely parse flags provided at run-time
Expand Down
14 changes: 8 additions & 6 deletions cli/controller/env.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,12 +96,13 @@ func (e *Env) load(path string) []string {
}

type envPortsData struct {
Peer int `json:"peer,omitempty"`
Node int `json:"node,omitempty"`
Esplora int `json:"esplora,omitempty"`
Electrs int `json:"electrs,omitempty"`
ElectrsRPC int `json:"electrs_rpc,omitempty"`
Chopsticks int `json:"chopsticks,omitempty"`
Peer int `json:"peer,omitempty"`
Node int `json:"node,omitempty"`
Esplora int `json:"esplora,omitempty"`
Electrs int `json:"electrs,omitempty"`
ElectrsRPC int `json:"electrs_rpc,omitempty"`
Chopsticks int `json:"chopsticks,omitempty"`
LiquidCoach int `json:"liquid_coach,omitempty"`
}
type envPorts struct {
Bitcoin *envPortsData `json:"bitcoin,omitempty"`
Expand All @@ -110,6 +111,7 @@ type envPorts struct {
type envUrls struct {
BitcoinEsplora string `json:"bitcoin_esplora,omitempty"`
LiquidEsplora string `json:"liquid_esplora,omitempty"`
LiquidCoach string `json:"liquid_coach,omitempty"`
}
type envJSON struct {
Ports *envPorts `json:"ports,omitempty"`
Expand Down
9 changes: 9 additions & 0 deletions resources/docker-compose-regtest-liquid.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,15 @@ services:
local:
ipv4_address: 10.10.0.17
restart: unless-stopped
liquid_coach:
image: vulpemventures/liquid-coach:latest
container_name: liquid_coach
networks:
local:
ipv4_address: 10.10.0.18
ports:
- ${LIQUID_COACH_PORT}:7000
restart: unless-stopped

networks:
local:
Expand Down