From 1cc3d05a15be7a37300dc2fde4463a70f02f42a9 Mon Sep 17 00:00:00 2001 From: FrancisMars <11526661+francismars@users.noreply.github.com> Date: Wed, 21 Oct 2020 15:27:43 +0100 Subject: [PATCH 1/5] added coach --- cli/constants/constants.go | 15 +++++++++------ cli/controller/controller.go | 9 +++++---- cli/controller/env.go | 2 ++ resources/docker-compose-regtest-liquid.yml | 11 +++++++++++ 4 files changed, 27 insertions(+), 10 deletions(-) diff --git a/cli/constants/constants.go b/cli/constants/constants.go index ebb7808..7bc9fbd 100644 --- a/cli/constants/constants.go +++ b/cli/constants/constants.go @@ -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{ @@ -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", + "coach": "http://localhost:7000", }, } diff --git a/cli/controller/controller.go b/cli/controller/controller.go index 3e18a82..ae8d56d 100644 --- a/cli/controller/controller.go +++ b/cli/controller/controller.go @@ -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 diff --git a/cli/controller/env.go b/cli/controller/env.go index 83045c2..f1af37a 100644 --- a/cli/controller/env.go +++ b/cli/controller/env.go @@ -102,6 +102,7 @@ type envPortsData struct { Electrs int `json:"electrs,omitempty"` ElectrsRPC int `json:"electrs_rpc,omitempty"` Chopsticks int `json:"chopsticks,omitempty"` + Coach int `json:"liquid-coach,omitempty"` } type envPorts struct { Bitcoin *envPortsData `json:"bitcoin,omitempty"` @@ -110,6 +111,7 @@ type envPorts struct { type envUrls struct { BitcoinEsplora string `json:"bitcoin_esplora,omitempty"` LiquidEsplora string `json:"liquid_esplora,omitempty"` + Coach string `json:"liquid-coach,omitempty"` } type envJSON struct { Ports *envPorts `json:"ports,omitempty"` diff --git a/resources/docker-compose-regtest-liquid.yml b/resources/docker-compose-regtest-liquid.yml index 2cc59d9..87cdb8b 100644 --- a/resources/docker-compose-regtest-liquid.yml +++ b/resources/docker-compose-regtest-liquid.yml @@ -166,6 +166,17 @@ 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 + environment: + API_URL: ${LIQUID_LIQUID-COACH_URL} + ports: + - ${LIQUID_LIQUID-COACH_PORT}:7000 + restart: unless-stopped networks: local: From 20daf949cab749d1376f669550f280f577021e8f Mon Sep 17 00:00:00 2001 From: FrancisMars <11526661+francismars@users.noreply.github.com> Date: Wed, 21 Oct 2020 15:30:26 +0100 Subject: [PATCH 2/5] change in constants --- cli/constants/constants.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cli/constants/constants.go b/cli/constants/constants.go index 7bc9fbd..b1d2e8a 100644 --- a/cli/constants/constants.go +++ b/cli/constants/constants.go @@ -51,7 +51,7 @@ var ( "urls": map[string]string{ "bitcoin_esplora": "http://localhost:3000", "liquid_esplora": "http://localhost:3001", - "coach": "http://localhost:7000", + "liquid-coach": "http://localhost:7000", }, } From cc83b4eaa8abe8417e3e4e90aa2d35c92ff21693 Mon Sep 17 00:00:00 2001 From: FrancisMars <11526661+francismars@users.noreply.github.com> Date: Wed, 21 Oct 2020 23:53:57 +0100 Subject: [PATCH 3/5] underscore instead of dash --- cli/constants/constants.go | 4 ++-- cli/controller/controller.go | 2 +- cli/controller/env.go | 16 ++++++++-------- resources/docker-compose-regtest-liquid.yml | 10 ++++------ 4 files changed, 15 insertions(+), 17 deletions(-) diff --git a/cli/constants/constants.go b/cli/constants/constants.go index b1d2e8a..75ac618 100644 --- a/cli/constants/constants.go +++ b/cli/constants/constants.go @@ -45,13 +45,13 @@ var ( "electrs": 3012, "electrs_rpc": 60401, "chopsticks": 3001, - "liquid-coach": 7000, + "liquid_coach": 7000, }, }, "urls": map[string]string{ "bitcoin_esplora": "http://localhost:3000", "liquid_esplora": "http://localhost:3001", - "liquid-coach": "http://localhost:7000", + "liquid_coach": "http://localhost:7000", }, } diff --git a/cli/controller/controller.go b/cli/controller/controller.go index ae8d56d..a404c9a 100644 --- a/cli/controller/controller.go +++ b/cli/controller/controller.go @@ -14,7 +14,7 @@ var Services = map[string]bool{ "esplora": true, "electrs": true, "chopsticks": true, - "liquid-coach": true, + "liquid_coach": true, } // Controller implements useful functions to securely parse flags provided at run-time diff --git a/cli/controller/env.go b/cli/controller/env.go index f1af37a..12661e4 100644 --- a/cli/controller/env.go +++ b/cli/controller/env.go @@ -96,13 +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"` - Coach int `json:"liquid-coach,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"` @@ -111,7 +111,7 @@ type envPorts struct { type envUrls struct { BitcoinEsplora string `json:"bitcoin_esplora,omitempty"` LiquidEsplora string `json:"liquid_esplora,omitempty"` - Coach string `json:"liquid-coach,omitempty"` + LiquidCoach string `json:"liquid_coach,omitempty"` } type envJSON struct { Ports *envPorts `json:"ports,omitempty"` diff --git a/resources/docker-compose-regtest-liquid.yml b/resources/docker-compose-regtest-liquid.yml index 87cdb8b..f126eb7 100644 --- a/resources/docker-compose-regtest-liquid.yml +++ b/resources/docker-compose-regtest-liquid.yml @@ -166,16 +166,14 @@ services: local: ipv4_address: 10.10.0.17 restart: unless-stopped - liquid-coach: + liquid_coach: image: vulpemventures/liquid-coach:latest - container_name: liquid-coach + container_name: liquid_coach networks: local: - ipv4_address: 10.10.0.18 - environment: - API_URL: ${LIQUID_LIQUID-COACH_URL} + ipv4_address: 10.10.0.18 ports: - - ${LIQUID_LIQUID-COACH_PORT}:7000 + - ${LIQUID_COACH_PORT}:7000 restart: unless-stopped networks: From d0a0853fa5d33933695c9d43086b03bc3fc38785 Mon Sep 17 00:00:00 2001 From: FrancisMars <11526661+francismars@users.noreply.github.com> Date: Fri, 27 Nov 2020 12:59:07 +0000 Subject: [PATCH 4/5] exposed liquid_coach port on compose --- resources/docker-compose-regtest-liquid.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/docker-compose-regtest-liquid.yml b/resources/docker-compose-regtest-liquid.yml index f126eb7..5af1e27 100644 --- a/resources/docker-compose-regtest-liquid.yml +++ b/resources/docker-compose-regtest-liquid.yml @@ -169,6 +169,7 @@ services: liquid_coach: image: vulpemventures/liquid-coach:latest container_name: liquid_coach + expose: 7000 networks: local: ipv4_address: 10.10.0.18 From 851d9d6747d5b164d71d88091dec7659de1a12e6 Mon Sep 17 00:00:00 2001 From: FrancisMars <11526661+francismars@users.noreply.github.com> Date: Fri, 27 Nov 2020 13:03:38 +0000 Subject: [PATCH 5/5] changed coach port env var name --- resources/docker-compose-regtest-liquid.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/resources/docker-compose-regtest-liquid.yml b/resources/docker-compose-regtest-liquid.yml index 5af1e27..3458110 100644 --- a/resources/docker-compose-regtest-liquid.yml +++ b/resources/docker-compose-regtest-liquid.yml @@ -169,12 +169,11 @@ services: liquid_coach: image: vulpemventures/liquid-coach:latest container_name: liquid_coach - expose: 7000 networks: local: ipv4_address: 10.10.0.18 ports: - - ${LIQUID_COACH_PORT}:7000 + - ${LIQUID_LIQUID_COACH_PORT}:7000 restart: unless-stopped networks: