Host ts-nitro example site through Caddy

stack_orchestrator/data/compose/docker-compose-nitro-auth.yml

@@ -14,7 +14,7 @@ services:
       CERC_VPA_ADDRESS: ${CERC_VPA_ADDRESS}
       CERC_CA_ADDRESS: ${CERC_CA_ADDRESS}
     env_file:
-      - ../config/go-nitro-auth/alice.env
+      - ../config/nitro-auth/alice.env
     entrypoint: ["bash", "-c", "/app/run-nitro-node.sh"]
     volumes:
       - nitro_deployment:/app/deployment
@@ -47,7 +47,7 @@ services:
       CERC_VPA_ADDRESS: ${CERC_VPA_ADDRESS}
       CERC_CA_ADDRESS: ${CERC_CA_ADDRESS}
     env_file:
-      - ../config/go-nitro-auth/bob.env
+      - ../config/nitro-auth/bob.env
     entrypoint: ["bash", "-c", "/app/run-nitro-node.sh"]
     volumes:
       - nitro_deployment:/app/deployment
@@ -67,6 +67,34 @@ services:
       - "4207"
       - "4217"
 
+  ts-nitro-charlie:
+    image: cerc/ts-nitro:local
+    hostname: ts-nitro-charlie
+    restart: on-failure
+    depends_on:
+      - go-nitro-bootnode
+    environment:
+      CERC_NITRO_CHAIN_PK: ${CERC_NITRO_CHAIN_PK_CHARLIE:-111b7500bdce494d6f4bcfe8c2a0dde2ef92f751d9070fac6475dbd6d8021b3f}
+      CERC_NITRO_CHAIN_URL: ${CERC_NITRO_CHAIN_URL:-ws://fixturenet-eth-geth-1:8546}
+      CERC_NA_ADDRESS: ${CERC_NA_ADDRESS}
+      CERC_VPA_ADDRESS: ${CERC_VPA_ADDRESS}
+      CERC_CA_ADDRESS: ${CERC_CA_ADDRESS}
+      CERC_NITRO_TARGET_URL: ${CERC_NITRO_TARGET_URL:-http://localhost:5678}
+      CERC_RUNTIME_ENV_RPC_URL: ${CERC_RUNTIME_ENV_RPC_URL:-ws://localhost:8546}
+      PUBLIC_URL: http://localhost:5678/ts-nitro
+    env_file:
+      - ../config/nitro-auth/charlie.env
+    entrypoint: ["bash", "-c", "/app/run.sh"]
+    volumes:
+      - nitro_deployment:/app/deployment
+      - ../config/ts-nitro/run.sh:/app/run.sh
+    healthcheck:
+      test: ["CMD", "nc", "-vz", "localhost", "3000"]
+      interval: 5s
+      timeout: 5s
+      retries: 100
+      start_period: 100s
+
   go-nitro-bootnode:
     image: cerc/go-nitro:local
     hostname: go-nitro-bootnode
@@ -78,7 +106,7 @@ services:
       CERC_CA_ADDRESS: ${CERC_CA_ADDRESS}
       CERC_NITRO_RELAY_ON: true
     env_file:
-      - ../config/go-nitro-auth/bootnode.env
+      - ../config/nitro-auth/bootnode.env
     entrypoint: [ "bash", "-c", "/app/run-nitro-node.sh" ]
     volumes:
       - nitro_deployment:/app/deployment
@@ -99,7 +127,7 @@ services:
     environment:
       CERC_ETH_RPC_ENDPOINT: ${CERC_ETH_RPC_ENDPOINT:-http://fixturenet-eth-geth-1:8545}
     volumes:
-      - ../config/go-nitro-auth/caddy/Caddyfile:/etc/caddy/Caddyfile
+      - ../config/nitro-auth/caddy/Caddyfile:/etc/caddy/Caddyfile
     ports:
       - "5678"
     depends_on:
@@ -110,4 +138,4 @@ volumes:
   go_nitro_data_alice:
   go_nitro_data_bob:
   go_nitro_data_bootnode:
-  nitro_deployment:
+  nitro_deployment:

stack_orchestrator/data/config/nitro-auth/bob.env

@@ -17,3 +17,5 @@ CERC_NITRO_RPC_PORT=4007
 CERC_NITRO_UI_PORT=4107
 CERC_NITRO_USE_DURABLE_STORE=true
 CERC_NITRO_WS_MSG_PORT=5007
+CERC_NITRO_MSG_PUBLIC_IP=127.0.0.1
+CERC_NITRO_MSG_PUBLIC_PORT=5007

stack_orchestrator/data/config/nitro-auth/caddy/Caddyfile

@@ -15,6 +15,7 @@
     rewrite * /
     reverse_proxy {$CERC_ETH_RPC_ENDPOINT} {
       header_up Host {upstream_hostport}
+      header_up -X-Forwarded-*
     }
   }
 
@@ -29,6 +30,7 @@
     rewrite * /
     reverse_proxy {$CERC_ETH_RPC_ENDPOINT} {
       header_up Host {upstream_hostport}
+      header_up -X-Forwarded-*
     }
   }
 
@@ -36,7 +38,11 @@
     respond "401 Unauthorized" 401
   }
 
+  handle /ts-nitro* {
+    reverse_proxy http://ts-nitro-charlie:3000
+  }
+
   handle {
     reverse_proxy http://go-nitro-alice:4206
   }
-}
+}

stack_orchestrator/data/config/nitro-auth/charlie.env

@@ -0,0 +1,19 @@
+# SET ME!  Your on-chain private key.
+#CERC_NITRO_CHAIN_PK=<MY_PK_GOES_HERE>
+
+# Default is CERC_NITRO_CHAIN_PK.
+#CERC_NITRO_PK=<MY_PK_GOES_HERE>
+
+# SET ME!  The WebSocket to connect to.
+#CERC_NITRO_CHAIN_URL=wss://linea-sepolia.infura.io/ws/v3/<MY_API_KEY_GOES_HERE>
+
+CERC_NITRO_AUTH_ON=false
+CERC_NITRO_AUTH_RPC_PORT=4009
+CERC_NITRO_AUTH_UI_PORT=4209
+CERC_NITRO_BOOT_PEERS="/dns4/go-nitro-bootnode/tcp/3008/p2p/16Uiu2HAmFYz5YPf3GtkfQsAwYJfDsKSm34U9qAiTwxW7RJUVGMRK"
+CERC_NITRO_DURABLE_STORE_FOLDER=/app/data/nitro-store
+CERC_NITRO_MSG_PORT=3009
+CERC_NITRO_RPC_PORT=4009
+CERC_NITRO_UI_PORT=4109
+CERC_NITRO_USE_DURABLE_STORE=true
+CERC_NITRO_WS_MSG_PORT=5009

stack_orchestrator/data/config/ts-nitro/run.sh

@@ -0,0 +1,45 @@
+#!/bin/bash
+
+if [ -n "$CERC_SCRIPT_DEBUG" ]; then
+  set -x
+fi
+
+if [ -z "$CERC_NITRO_CHAIN_PK" ] || [ -z "$CERC_NITRO_CHAIN_URL" ]; then
+  echo "You most set both CERC_NITRO_CHAIN_PK and CERC_NITRO_CHAIN_URL." 1>&2
+  exit 1
+fi
+
+nitro_addresses_file="/app/deployment/nitro-addresses.json"
+
+# Check if CERC_NA_ADDRESS environment variable is set
+if [ -n "$CERC_NA_ADDRESS" ]; then
+  echo "CERC_NA_ADDRESS is set to '$CERC_NA_ADDRESS'"
+  echo "CERC_VPA_ADDRESS is set to '$CERC_VPA_ADDRESS'"
+  echo "CERC_CA_ADDRESS is set to '$CERC_CA_ADDRESS'"
+  echo "Using the above Nitro addresses"
+
+  NA_ADDRESS=${CERC_NA_ADDRESS}
+  VPA_ADDRESS=${CERC_VPA_ADDRESS}
+  CA_ADDRESS=${CERC_CA_ADDRESS}
+elif [ -f ${nitro_addresses_file} ]; then
+  echo "Reading Nitro addresses from ${nitro_addresses_file}"
+
+  NA_ADDRESS=$(jq -r '.nitroAdjudicatorAddress' ${nitro_addresses_file})
+  VPA_ADDRESS=$(jq -r '.virtualPaymentAppAddress' ${nitro_addresses_file})
+  CA_ADDRESS=$(jq -r '.consensusAppAddress' ${nitro_addresses_file})
+else
+  echo "File ${nitro_addresses_file} not found"
+  exit 1
+fi
+
+cd /app/packages/example-web-app
+cat > .env <<EOF
+REACT_APP_RPC_URL=${CERC_RUNTIME_ENV_RPC_URL:-$CERC_NITRO_CHAIN_URL}
+REACT_APP_TARGET_URL=${CERC_RUNTIME_ENV_TARGET_URL:-$CERC_NITRO_TARGET_URL}
+REACT_APP_NITRO_PK=${CERC_NITRO_PK:-$CERC_NITRO_CHAIN_PK}
+REACT_APP_NA_ADDRESS=${NA_ADDRESS}
+REACT_APP_VPA_ADDRESS=${VPA_ADDRESS}
+REACT_APP_CA_ADDRESS=${CA_ADDRESS}
+EOF
+
+yarn start

stack_orchestrator/data/container-build/cerc-fixturenet-eth-geth/run-el.sh

@@ -6,7 +6,7 @@ fi
 
 ETHERBASE=`cat /opt/testnet/build/el/accounts.csv | head -1 | cut -d',' -f2`
 NETWORK_ID=`cat /opt/testnet/el/el-config.yaml | grep 'chain_id' | awk '{ print $2 }'`
-NETRESTRICT=`ip addr | grep inet | grep -v '127.0' | awk '{print $2}'`
+NETRESTRICT=`ip addr | grep 'inet ' | grep -v '127.0' | head -1 | awk '{print $2}'`
 CERC_ETH_DATADIR="${CERC_ETH_DATADIR:-$HOME/ethdata}"
 CERC_PLUGINS_DIR="${CERC_PLUGINS_DIR:-/usr/local/lib/plugeth}"
 

stack_orchestrator/data/container-build/cerc-ts-nitro/Dockerfile

@@ -0,0 +1,12 @@
+FROM node:18.17.1-alpine3.18
+
+RUN apk --update --no-cache add python3 alpine-sdk bash curl jq
+
+WORKDIR /app
+
+COPY . .
+
+RUN echo "Installing dependencies" && \
+  yarn && yarn build:node && yarn build:browser
+
+WORKDIR /app

stack_orchestrator/data/container-build/cerc-ts-nitro/build.sh

@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+# Build cerc/ts-nitro
+
+source ${CERC_CONTAINER_BASE_DIR}/build-base.sh
+
+# See: https://stackoverflow.com/a/246128/1701505
+SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
+
+docker build -t cerc/ts-nitro:local -f ${SCRIPT_DIR}/Dockerfile ${build_command_args} ${CERC_REPO_BASE_DIR}/ts-nitro

stack_orchestrator/data/stacks/nitro-auth/stack.yml

@@ -1,16 +1,17 @@
 version: "1.0"
-name: go-nitro-auth
+name: nitro-auth
 description: "Stack to demonstrate payments between various services"
 repos:
-  # for nitro-contracts
-  - github.com/cerc-io/ts-nitro@v0.1.15
-  # for go-nitro and nitro-rpc-client
+  # for nitro-contracts and ts-nitro example app
+  - github.com/cerc-io/ts-nitro@telackey/demo-auth
+  # for go-nitro, nitro-rpc-client, and go-nitro-auth example app
   - github.com/cerc-io/go-nitro@telackey/update
 containers:
   # nitro
   - cerc/nitro-contracts
+  - cerc/ts-nitro
   - cerc/go-nitro
   - cerc/nitro-rpc-client
 pods:
   - nitro-contracts
-  - go-nitro-auth
+  - nitro-auth

stack_orchestrator/deploy/webapp/deploy_webapp_from_registry.py

@@ -39,12 +39,11 @@ def process_app_deployment_request(
     app_deployment_request,
     deployment_record_namespace,
     dns_record_namespace,
-    default_dns_suffix,
+    dns_suffix,
     deployment_parent_dir,
     kube_config,
     image_registry,
     force_rebuild,
-    fqdn_policy,
     logger
 ):
     logger.log("BEGIN - process_app_deployment_request")
@@ -57,15 +56,14 @@ def process_app_deployment_request(
     requested_name = hostname_for_deployment_request(app_deployment_request, laconic)
     logger.log(f"Determined requested name: {requested_name}")
 
+    # HACK
     if "." in requested_name:
-        if "allow" == fqdn_policy or "preexisting" == fqdn_policy:
-            fqdn = requested_name
-        else:
-            raise Exception(f"{requested_name} is invalid: only unqualified hostnames are allowed.")
-    else:
-        fqdn = f"{requested_name}.{default_dns_suffix}"
+        raise Exception("Only unqualified hostnames allowed at this time.")
+
+    fqdn = f"{requested_name}.{dns_suffix}"
 
     # 3. check ownership of existing dnsrecord vs this request
+    # TODO: Support foreign DNS
     dns_crn = f"{dns_record_namespace}/{fqdn}"
     dns_record = laconic.get_record(dns_crn)
     if dns_record:
@@ -77,9 +75,7 @@ def process_app_deployment_request(
             logger.log(f"Matched DnsRecord ownership: {matched_owner}")
         else:
             raise Exception("Unable to confirm ownership of DnsRecord %s for request %s" %
-                            (dns_crn, app_deployment_request.id))
-    elif "preexisting" == fqdn_policy:
-        raise Exception(f"No pre-existing DnsRecord {dns_crn} could be found for request {app_deployment_request.id}.")
+                            (dns_record.id, app_deployment_request.id))
 
     # 4. get build and runtime config from request
     env_filename = None
@@ -195,7 +191,6 @@ def dump_known_requests(filename, requests, status="SEEN"):
 @click.option("--state-file", help="File to store state about previously seen requests.")
 @click.option("--only-update-state", help="Only update the state file, don't process any requests anything.", is_flag=True)
 @click.option("--dns-suffix", help="DNS domain to use eg, laconic.servesthe.world")
-@click.option("--fqdn-policy", help="How to handle requests with an FQDN: prohibit, allow, preexisting", default="prohibit")
 @click.option("--record-namespace-dns", help="eg, crn://laconic/dns")
 @click.option("--record-namespace-deployments", help="eg, crn://laconic/deployments")
 @click.option("--dry-run", help="Don't do anything, just report what would be done.", is_flag=True)
@@ -206,7 +201,7 @@ def dump_known_requests(filename, requests, status="SEEN"):
 @click.pass_context
 def command(ctx, kube_config, laconic_config, image_registry, deployment_parent_dir,  # noqa: C901
             request_id, discover, state_file, only_update_state,
-            dns_suffix, fqdn_policy, record_namespace_dns, record_namespace_deployments, dry_run,
+            dns_suffix, record_namespace_dns, record_namespace_deployments, dry_run,
             include_tags, exclude_tags, force_rebuild, log_dir):
     if request_id and discover:
         print("Cannot specify both --request-id and --discover", file=sys.stderr)
@@ -225,10 +220,6 @@ def command(ctx, kube_config, laconic_config, image_registry, deployment_parent_
             print("--dns-suffix, --record-namespace-dns, and --record-namespace-deployments are all required", file=sys.stderr)
             sys.exit(2)
 
-    if fqdn_policy not in ["prohibit", "allow", "preexisting"]:
-        print("--fqdn-policy must be one of 'prohibit', 'allow', or 'preexisting'", file=sys.stderr)
-        sys.exit(2)
-
     # Split CSV and clean up values.
     include_tags = [tag.strip() for tag in include_tags.split(",") if tag]
     exclude_tags = [tag.strip() for tag in exclude_tags.split(",") if tag]
@@ -343,7 +334,6 @@ def command(ctx, kube_config, laconic_config, image_registry, deployment_parent_
                     kube_config,
                     image_registry,
                     force_rebuild,
-                    fqdn_policy,
                     logger
                 )
                 status = "DEPLOYED"