Handle udp ports mapped (#534)

* Handle udp ports mapped

* Fix lint error

app/data/container-build/cerc-watcher-erc20/build.sh

@@ -6,4 +6,4 @@ 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/watcher-erc20:local -f ${SCRIPT_DIR}/Dockerfile ${build_command_args} ${CERC_REPO_BASE_DIR}/erc20-watcher-ts
+docker build -t cerc/watcher-erc20:local -f ${SCRIPT_DIR}/Dockerfile ${build_command_args} ${CERC_REPO_BASE_DIR}/watcher-ts

app/data/stacks/erc20/stack.yml

@@ -4,7 +4,7 @@ repos:
   - github.com/cerc-io/go-ethereum
   - github.com/cerc-io/ipld-eth-db
   - github.com/cerc-io/ipld-eth-server
-  - github.com/cerc-io/erc20-watcher-ts
+  - github.com/cerc-io/watcher-ts
   - github.com/dboreham/foundry
 containers:
   - cerc/foundry

app/data/stacks/mainnet-eth/stack.yml

@@ -1,4 +1,4 @@
-version: "1.1"
+version: "1.2"
 name: mainnet-eth
 description: "Ethereum Mainnet"
 repos:
@@ -7,7 +7,6 @@ repos:
   - github.com/dboreham/foundry
   - git.vdb.to/cerc-io/keycloak-reg-api
   - git.vdb.to/cerc-io/keycloak-reg-ui
-  - github.com/vulcanize/eth-api-proxy
 containers:
   - cerc/go-ethereum
   - cerc/lighthouse
@@ -17,10 +16,8 @@ containers:
   - cerc/webapp-base
   - cerc/keycloak-reg-api
   - cerc/keycloak-reg-ui
-  - cerc/eth-api-proxy
 pods:
   - mainnet-eth
   - mainnet-eth-keycloak
   - mainnet-eth-metrics
-  - mainnet-eth-api-proxy
   - foundry

app/deployment_create.py

@@ -178,16 +178,18 @@ def _get_mapped_ports(stack: str, map_recipe: str):
                     ports_array = ports[service]
                     for x in range(0, len(ports_array)):
                         orig_port = ports_array[x]
+                        # Strip /udp suffix if present
+                        bare_orig_port = orig_port.replace("/udp", "")
                         random_port = random.randint(20000, 50000)  # Beware: we're relying on luck to not collide
                         if map_recipe == "any-variable-random":
                             # This is the default so take no action
                             pass
                         elif map_recipe == "localhost-same":
                             # Replace instances of "- XX" with "- 127.0.0.1:XX"
-                            ports_array[x] = f"127.0.0.1:{orig_port}:{orig_port}"
+                            ports_array[x] = f"127.0.0.1:{bare_orig_port}:{orig_port}"
                         elif map_recipe == "any-same":
                             # Replace instances of "- XX" with "- 0.0.0.0:XX"
-                            ports_array[x] = f"0.0.0.0:{orig_port}:{orig_port}"
+                            ports_array[x] = f"0.0.0.0:{bare_orig_port}:{orig_port}"
                         elif map_recipe == "localhost-fixed-random":
                             # Replace instances of "- XX" with "- 127.0.0.1:<rnd>:XX"
                             ports_array[x] = f"127.0.0.1:{random_port}:{orig_port}"