From f2e23e987c0e2fa6f95fb024eb485baaee2086e8 Mon Sep 17 00:00:00 2001 From: Thomas E Lackey Date: Sat, 22 Jun 2024 00:03:01 -0500 Subject: [PATCH] WIP: coupons --- .../compose/docker-compose-nitro-auth.yml | 39 +++++++++++++++++++ .../config/go-nitro/run-nitro-node.sh | 8 ++++ .../container-build/cerc-go-nitro/Dockerfile | 7 +++- 3 files changed, 53 insertions(+), 1 deletion(-) diff --git a/stack-orchestrator/compose/docker-compose-nitro-auth.yml b/stack-orchestrator/compose/docker-compose-nitro-auth.yml index 8a3eeb1..0a5dc49 100644 --- a/stack-orchestrator/compose/docker-compose-nitro-auth.yml +++ b/stack-orchestrator/compose/docker-compose-nitro-auth.yml @@ -20,6 +20,7 @@ services: - nitro_deployment:/app/deployment - go_nitro_data_alice:/app/data - ../config/go-nitro/run-nitro-node.sh:/app/run-nitro-node.sh + - ../config/go-nitro/create-nitro-channel.sh:/app/create-nitro-channel.sh healthcheck: test: ["CMD", "nc", "-vz", "localhost", "4006"] interval: 5s @@ -54,6 +55,7 @@ services: - nitro_deployment:/app/deployment - go_nitro_data_bob:/app/data - ../config/go-nitro/run-nitro-node.sh:/app/run-nitro-node.sh + - ../config/go-nitro/create-nitro-channel.sh:/app/create-nitro-channel.sh healthcheck: test: ["CMD", "nc", "-vz", "localhost", "4007"] interval: 5s @@ -68,6 +70,42 @@ services: - "4207" - "4217" + go-nitro-dan: + image: cerc/go-nitro:local + hostname: go-nitro-dan + restart: on-failure + depends_on: + - go-nitro-bootnode + environment: + CERC_NITRO_CHAIN_PK: ${CERC_NITRO_CHAIN_PK_DAN:-fb1e9af328c283ca3e2486e7c24d13582b7912057d8b9542ff41503c85bc05c0} + CERC_NITRO_CHAIN_URL: ${CERC_NITRO_CHAIN_URL:-ws://fixturenet-eth-geth-1:8546} + CERC_NITRO_GETH_HTTP_URL: ${CERC_NITRO_GETH_HTTP_URL:-http://fixturenet-eth-geth-1:8545} + CERC_NA_ADDRESS: ${CERC_NA_ADDRESS} + CERC_VPA_ADDRESS: ${CERC_VPA_ADDRESS} + CERC_CA_ADDRESS: ${CERC_CA_ADDRESS} + env_file: + - ../config/nitro-auth/dan.env + entrypoint: ["bash", "-c", "/app/run-nitro-node.sh"] + volumes: + - nitro_deployment:/app/deployment + - go_nitro_data_bob:/app/data + - ../config/go-nitro/run-nitro-node.sh:/app/run-nitro-node.sh + - ../config/go-nitro/create-nitro-channel.sh:/app/create-nitro-channel.sh + healthcheck: + test: ["CMD", "nc", "-vz", "localhost", "4009"] + interval: 5s + timeout: 5s + retries: 100 + start_period: 100s + ports: + - "3009" + - "4009" + - "5009" + - "4109" + - "4209" + - "4219" + - "8549" + ts-nitro-charlie: image: cerc/ts-nitro:local hostname: ts-nitro-charlie @@ -113,6 +151,7 @@ services: - nitro_deployment:/app/deployment - go_nitro_data_bootnode:/app/data - ../config/go-nitro/run-nitro-node.sh:/app/run-nitro-node.sh + - ../config/go-nitro/create-nitro-channel.sh:/app/create-nitro-channel.sh healthcheck: test: [ "CMD", "nc", "-vz", "localhost", "4008" ] interval: 5s diff --git a/stack-orchestrator/config/go-nitro/run-nitro-node.sh b/stack-orchestrator/config/go-nitro/run-nitro-node.sh index ea090a6..62a00cf 100755 --- a/stack-orchestrator/config/go-nitro/run-nitro-node.sh +++ b/stack-orchestrator/config/go-nitro/run-nitro-node.sh @@ -73,6 +73,14 @@ if [[ "$CERC_NITRO_AUTH_ON" == "true" ]] && [[ -d "/app-node/packages/nitro-auth bash -c "sleep 6 && cd /app-node/packages/nitro-auth && yarn start" & fi +if [[ "$CERC_NITRO_COUPON_ON" == "true" ]] && [[ -d "/app-node/packages/nitro-coupon/dist" ]]; then + bash -c "sleep 6 && cd /app-node/packages/nitro-coupon && yarn start" & +fi + +if [[ -n "$CERC_NITRO_AUTO_CREATE_LEDGER_ADDRESS" ]] && [[ $CERC_NITRO_AUTO_CREATE_LEDGER_AMOUNT -gt 0 ]]; then + bash -c "sleep 15 && /app/create-nitro-channel.sh $CERC_NITRO_AUTO_CREATE_LEDGER_ADDRESS $CERC_NITRO_AUTO_CREATE_LEDGER_AMOUNT false" & +fi + if [[ "$CERC_NITRO_RELAY_ON" == "true" ]]; then if [[ ! -f "/app/deployment/relay-node.json" ]]; then node /usr/local/lib/node_modules/@cerc-io/peer/dist/cli/create-peer.js \ diff --git a/stack-orchestrator/container-build/cerc-go-nitro/Dockerfile b/stack-orchestrator/container-build/cerc-go-nitro/Dockerfile index 9057d3b..2fa13d4 100644 --- a/stack-orchestrator/container-build/cerc-go-nitro/Dockerfile +++ b/stack-orchestrator/container-build/cerc-go-nitro/Dockerfile @@ -24,6 +24,10 @@ RUN if [ -d /app/packages/nitro-auth-gui ]; then \ fi WORKDIR /app/packages/nitro-auth RUN if [ -d /app/packages/nitro-auth ]; then cd /app/packages/nitro-auth && yarn build; fi +WORKDIR /app/packages/nitro-coupon +RUN if [ -d /app/packages/nitro-coupon ]; then cd /app/packages/nitro-coupon && yarn build; fi +WORKDIR /app/packages/nitro-rpc-client +RUN if [ -d /app/packages/nitro-rpc-client ]; then cd /app/packages/nitro-rpc-client && yarn build; fi FROM node:18-bullseye-slim RUN apt-get update @@ -34,4 +38,5 @@ RUN npm config set @cerc-io:registry https://git.vdb.to/api/packages/cerc-io/npm RUN npm install -g @cerc-io/peer WORKDIR /app COPY --from=builder /app/nitro . -COPY --from=builder-node /app /app-node \ No newline at end of file +COPY --from=builder-node /app /app-node +RUN if [ -f /app-node/packages/nitro-rpc-client/bin/nitro-rpc-client.js ]; then ln -s /app-node/packages/nitro-rpc-client/bin/nitro-rpc-client.js /bin/nitro-rpc-client; fi