Change delimeter while replacing deny multiaddrs list

Former-commit-id: db27b07d99
Use provided domain for relay multiaddr in peer config
2023-05-05 13:28:57 +05:30 · 2023-05-05 10:27:26 +05:30 · 2023-05-04 20:01:38 +05:30 · 2023-05-04 20:00:58 +05:30 · 2023-05-04 18:42:45 +05:30
22 changed files with 11 additions and 431 deletions
@@ -115,7 +115,7 @@ def command(ctx, include, exclude, force_rebuild, extra_build_args):
            # TODO: make this less of a hack -- should be specified in some metadata somewhere
            # Check if we have a repo for this container. If not, set the context dir to the container-build subdir
            repo_full_path = os.path.join(dev_root_path, repo_dir)
-            repo_dir_or_build_dir = repo_full_path if os.path.exists(repo_full_path) else build_dir
+            repo_dir_or_build_dir = repo_dir if os.path.exists(repo_full_path) else build_dir
            build_command = os.path.join(container_build_dir, "default-build.sh") + f" {container}:local {repo_dir_or_build_dir}"
        if not dry_run:
            if verbose:
@@ -1,91 +0,0 @@
-version: '3.2'
-
-services:
-  # Starts the PostgreSQL database for watcher
-  gelato-watcher-db:
-    restart: unless-stopped
-    image: postgres:14-alpine
-    environment:
-      - POSTGRES_USER=vdbm
-      - POSTGRES_MULTIPLE_DATABASES=gelato-watcher,gelato-watcher-job-queue
-      - POSTGRES_EXTENSION=gelato-watcher-job-queue:pgcrypto
-      - POSTGRES_PASSWORD=password
-    volumes:
-      - ../config/postgresql/multiple-postgressql-databases.sh:/docker-entrypoint-initdb.d/multiple-postgressql-databases.sh
-      - gelato_watcher_db_data:/var/lib/postgresql/data
-    ports:
-      - "0.0.0.0:15432:5432"
-    healthcheck:
-      test: ["CMD", "nc", "-v", "localhost", "5432"]
-      interval: 10s
-      timeout: 5s
-      retries: 15
-      start_period: 10s
-
-  # Starts the gelato-watcher job runner
-  gelato-watcher-job-runner:
-    image: cerc/watcher-gelato:local
-    restart: unless-stopped
-    depends_on:
-      gelato-watcher-db:
-        condition: service_healthy
-    env_file:
-      - ../config/watcher-gelato/watcher-params.env
-    environment:
-      CERC_SCRIPT_DEBUG: ${CERC_SCRIPT_DEBUG}
-      CERC_IPLD_ETH_RPC: ${CERC_IPLD_ETH_RPC}
-      CERC_IPLD_ETH_GQL: ${CERC_IPLD_ETH_GQL}
-    command: ["./start-job-runner.sh"]
-    volumes:
-      - ../config/watcher-gelato/watcher-config-template.toml:/app/environments/watcher-config-template.toml
-      - ../config/watcher-gelato/start-job-runner.sh:/app/start-job-runner.sh
-    ports:
-      - "0.0.0.0:9000:9000"
-    healthcheck:
-      test: ["CMD", "nc", "-v", "localhost", "9000"]
-      interval: 10s
-      timeout: 5s
-      retries: 15
-      start_period: 10s
-    extra_hosts:
-      - "host.docker.internal:host-gateway"
-
-  # Starts the gelato-watcher server
-  gelato-watcher-server:
-    image: cerc/watcher-gelato:local
-    restart: unless-stopped
-    depends_on:
-      gelato-watcher-db:
-        condition: service_healthy
-      gelato-watcher-job-runner:
-        condition: service_healthy
-    env_file:
-      - ../config/watcher-gelato/watcher-params.env
-    environment:
-      CERC_SCRIPT_DEBUG: ${CERC_SCRIPT_DEBUG}
-      CERC_IPLD_ETH_RPC: ${CERC_IPLD_ETH_RPC}
-      CERC_IPLD_ETH_GQL: ${CERC_IPLD_ETH_GQL}
-      CERC_USE_STATE_SNAPSHOT: ${CERC_USE_STATE_SNAPSHOT}
-      CERC_SNAPSHOT_GQL_ENDPOINT: ${CERC_SNAPSHOT_GQL_ENDPOINT}
-      CERC_SNAPSHOT_BLOCKHASH: ${CERC_SNAPSHOT_BLOCKHASH}
-    command: ["./start-server.sh"]
-    volumes:
-      - ../config/watcher-gelato/watcher-config-template.toml:/app/environments/watcher-config-template.toml
-      - ../config/watcher-gelato/start-server.sh:/app/start-server.sh
-      - ../config/watcher-gelato/create-and-import-checkpoint.sh:/app/create-and-import-checkpoint.sh
-      - gelato_watcher_state_gql:/app/state_checkpoint
-    ports:
-      - "0.0.0.0:3008:3008"
-      - "0.0.0.0:9001:9001"
-    healthcheck:
-      test: ["CMD", "nc", "-v", "localhost", "3008"]
-      interval: 20s
-      timeout: 5s
-      retries: 15
-      start_period: 5s
-    extra_hosts:
-      - "host.docker.internal:host-gateway"
-
-volumes:
-  gelato_watcher_db_data:
-  gelato_watcher_state_gql:
@@ -1,28 +0,0 @@
-#!/bin/bash
-set -e
-if [ -n "$CERC_SCRIPT_DEBUG" ]; then
-  set -x
-fi
-
-CERC_SNAPSHOT_GQL_ENDPOINT="${CERC_SNAPSHOT_GQL_ENDPOINT:-${DEFAULT_CERC_SNAPSHOT_GQL_ENDPOINT}}"
-CERC_SNAPSHOT_BLOCKHASH="${CERC_SNAPSHOT_BLOCKHASH:-${DEFAULT_CERC_SNAPSHOT_BLOCKHASH}}"
-
-CHECKPOINT_FILE_PATH="./state_checkpoint/state-gql-${CERC_SNAPSHOT_BLOCKHASH}"
-
-if [ -f "${CHECKPOINT_FILE_PATH}" ]; then
-  # Skip checkpoint creation if the file already exists
-  echo "File at ${CHECKPOINT_FILE_PATH} already exists, skipping checkpoint creation..."
-else
-  # Create a checkpoint using GQL endpoint
-  echo "Creating a state checkpoint using GQL endpoint..."
-  yarn create-state-gql \
-    --snapshot-block-hash "${CERC_SNAPSHOT_BLOCKHASH}" \
-    --gql-endpoint "${CERC_SNAPSHOT_GQL_ENDPOINT}" \
-    --output "${CHECKPOINT_FILE_PATH}"
-fi
-
-echo "Initializing watcher using a state snapshot..."
-
-# Import the state checkpoint
-# (skips if snapshot block is already indexed)
-yarn import-state --import-file "${CHECKPOINT_FILE_PATH}"
@@ -1,23 +0,0 @@
-#!/bin/bash
-set -e
-if [ -n "$CERC_SCRIPT_DEBUG" ]; then
-  set -x
-fi
-
-CERC_IPLD_ETH_RPC="${CERC_IPLD_ETH_RPC:-${DEFAULT_CERC_IPLD_ETH_RPC}}"
-CERC_IPLD_ETH_GQL="${CERC_IPLD_ETH_GQL:-${DEFAULT_CERC_IPLD_ETH_GQL}}"
-
-echo "Using ETH server RPC endpoint ${CERC_IPLD_ETH_RPC}"
-echo "Using ETH server GQL endpoint ${CERC_IPLD_ETH_GQL}"
-
-# Read in the config template TOML file and modify it
-WATCHER_CONFIG_TEMPLATE=$(cat environments/watcher-config-template.toml)
-WATCHER_CONFIG=$(echo "$WATCHER_CONFIG_TEMPLATE" | \
-  sed -E "s|REPLACE_WITH_CERC_IPLD_ETH_GQL|${CERC_IPLD_ETH_GQL}|g; \
-          s|REPLACE_WITH_CERC_IPLD_ETH_RPC|${CERC_IPLD_ETH_RPC}| ")
-
-# Write the modified content to a new file
-echo "$WATCHER_CONFIG" > environments/local.toml
-
-echo "Running job-runner"
-DEBUG=vulcanize:* exec node --enable-source-maps dist/job-runner.js
@@ -1,32 +0,0 @@
-#!/bin/bash
-set -e
-if [ -n "$CERC_SCRIPT_DEBUG" ]; then
-  set -x
-fi
-
-CERC_IPLD_ETH_RPC="${CERC_IPLD_ETH_RPC:-${DEFAULT_CERC_IPLD_ETH_RPC}}"
-CERC_IPLD_ETH_GQL="${CERC_IPLD_ETH_GQL:-${DEFAULT_CERC_IPLD_ETH_GQL}}"
-
-CERC_USE_STATE_SNAPSHOT="${CERC_USE_STATE_SNAPSHOT:-${DEFAULT_CERC_USE_STATE_SNAPSHOT}}"
-
-echo "Using ETH server RPC endpoint ${CERC_IPLD_ETH_RPC}"
-echo "Using ETH server GQL endpoint ${CERC_IPLD_ETH_GQL}"
-
-# Read in the config template TOML file and modify it
-WATCHER_CONFIG_TEMPLATE=$(cat environments/watcher-config-template.toml)
-WATCHER_CONFIG=$(echo "$WATCHER_CONFIG_TEMPLATE" | \
-  sed -E "s|REPLACE_WITH_CERC_IPLD_ETH_GQL|${CERC_IPLD_ETH_GQL}|g; \
-          s|REPLACE_WITH_CERC_IPLD_ETH_RPC|${CERC_IPLD_ETH_RPC}| ")
-
-# Write the modified content to a new file
-echo "$WATCHER_CONFIG" > environments/local.toml
-
-if [ "$CERC_USE_STATE_SNAPSHOT" = true ] ; then
-  ./create-and-import-checkpoint.sh
-else
-  echo "Initializing watcher using fill..."
-  yarn fill --start-block $DEFAULT_CERC_GELATO_START_BLOCK --end-block $DEFAULT_CERC_GELATO_START_BLOCK
-fi
-
-echo "Running active server"
-DEBUG=vulcanize:* exec node --enable-source-maps dist/server.js
@@ -1,75 +0,0 @@
-[server]
-  host = "0.0.0.0"
-  port = 3008
-  kind = "active"
-
-  # Checkpointing state.
-  checkpointing = true
-
-  # Checkpoint interval in number of blocks.
-  checkpointInterval = 2000
-
-  # Enable state creation
-  # CAUTION: Disable only if state creation is not desired or can be filled subsequently
-  enableState = true
-
-  subgraphPath = "./subgraph"
-
-  # Interval to restart wasm instance periodically
-  wasmRestartBlocksInterval = 20
-
-  # Interval in number of blocks at which to clear entities cache.
-  clearEntitiesCacheInterval = 1000
-
-  # Boolean to filter logs by contract.
-  filterLogs = true
-
-  # Max block range for which to return events in eventsInRange GQL query.
-  # Use -1 for skipping check on block range.
-  maxEventsBlockRange = 1000
-
-  # GQL cache settings
-  [server.gqlCache]
-    enabled = true
-
-    # Max in-memory cache size (in bytes) (default 8 MB)
-    # maxCacheSize
-
-    # GQL cache-control max-age settings (in seconds)
-    maxAge = 15
-    timeTravelMaxAge = 86400 # 1 day
-
-[metrics]
-  host = "0.0.0.0"
-  port = 9000
-  [metrics.gql]
-    port = 9001
-
-[database]
-  type = "postgres"
-  host = "gelato-watcher-db"
-  port = 5432
-  database = "gelato-watcher"
-  username = "vdbm"
-  password = "password"
-  synchronize = true
-  logging = false
-
-[upstream]
-  [upstream.ethServer]
-    gqlApiEndpoint = "REPLACE_WITH_CERC_IPLD_ETH_GQL"
-    rpcProviderEndpoint = "REPLACE_WITH_CERC_IPLD_ETH_RPC"
-
-  [upstream.cache]
-    name = "requests"
-    enabled = false
-    deleteOnStart = false
-
-[jobQueue]
-  dbConnectionString = "postgres://vdbm:password@gelato-watcher-db/gelato-watcher-job-queue"
-  maxCompletionLagInSecs = 300
-  jobDelayInMilliSecs = 100
-  eventsInBatch = 50
-  blockDelayInMilliSecs = 2000
-  prefetchBlocksInMem = true
-  prefetchBlockCount = 10
@@ -1,13 +0,0 @@
-# ipld-eth-server endpoints
-DEFAULT_CERC_IPLD_ETH_RPC="http://ipld-eth-server:8082"
-DEFAULT_CERC_IPLD_ETH_GQL="http://ipld-eth-server:8083/graphql"
-
-# Gelato start block
-DEFAULT_CERC_GELATO_START_BLOCK=11361987
-
-# Whether to use a state snapshot to initialize the watcher
-DEFAULT_CERC_USE_STATE_SNAPSHOT=false
-
-# State snapshot params
-DEFAULT_CERC_SNAPSHOT_GQL_ENDPOINT=
-DEFAULT_CERC_SNAPSHOT_BLOCKHASH=
@@ -1,12 +0,0 @@
-FROM node:18.15.0-alpine3.16
-
-RUN apk --update --no-cache add git python3 alpine-sdk bash
-
-WORKDIR /app
-
-COPY . .
-
-RUN echo "Building gelato-watcher-ts" && \
-  yarn && yarn build
-
-WORKDIR /app
@@ -1,9 +0,0 @@
-#!/usr/bin/env bash
-# Build cerc/watcher-gelato
-
-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-gelato:local -f ${SCRIPT_DIR}/Dockerfile ${build_command_args} ${CERC_REPO_BASE_DIR}/gelato-watcher-ts
@@ -15,6 +15,6 @@ WORKDIR /app
 COPY . .

 RUN echo "Building mobymask-v2-watcher-ts" && \
-  yarn && yarn build
+    yarn && yarn build

 WORKDIR /app
@@ -38,5 +38,3 @@ cerc/optimism-op-node
 cerc/optimism-op-proposer
 cerc/pocket
 cerc/watcher-azimuth
-cerc/ipld-eth-state-snapshot
-cerc/watcher-gelato
@@ -26,4 +26,3 @@ foundry
 fixturenet-optimism
 fixturenet-pocket
 watcher-azimuth
-watcher-gelato
@@ -30,5 +30,3 @@ ethereum-optimism/optimism
 pokt-network/pocket-core
 pokt-network/pocket-core-deployments
 cerc-io/azimuth-watcher-ts
-cerc-io/ipld-eth-state-snapshot
-cerc-io/gelato-watcher-ts
@@ -4,7 +4,7 @@ Instructions to setup and deploy Azimuth Watcher stack

 ## Setup

-Prerequisite: `ipld-eth-server` RPC and GQL endpoints
+Prerequisite: ipld-eth-server RPC and GQL endpoints

 Clone required repositories:

@@ -41,7 +41,7 @@ This should create the required docker images in the local image registry.
  CERC_IPLD_ETH_GQL=
  ```

-* NOTE: If `ipld-eth-server` is running on the host machine, use `host.docker.internal` as the hostname to access host ports
+* NOTE: If ipld-eth-server is running on the host machine, use `host.docker.internal` as the hostname to access host ports

 ### Deploy the stack

@@ -30,7 +30,7 @@ $ laconic-so --stack package-registry deploy up
 ⠿ Container laconic-aecc4a21d3a502b14522db97d427e850-server-1  Started                                                                                    1.9s
 New user 'gitea_admin' has been successfully created!
 This is your gitea access token: 84fe66a73698bf11edbdccd0a338236b7d1d5c45. Keep it safe and secure, it can not be fetched again from gitea.
-To use with laconic-so set this environment variable: export CERC_NPM_AUTH_TOKEN=84fe66a73698bf11edbdccd0a338236b7d1d5c45
+To use with laconic-so set this environment variable: export CERC_NPM_AUTH_TOKEN=3e493e77b3e83fe9e882f7e3a79dd4d5441c308b
 Created the organization cerc-io
 Gitea was configured to use host name: gitea.local, ensure that this resolves to localhost, e.g. with sudo vi /etc/hosts
 Success, gitea is properly initialized
@@ -1,13 +0,0 @@
-version: "1.0"
-name: chain-chunker
-decription: "Stack to build containers for chain-chunker"
-repos:
-  - cerc-io/ipld-eth-state-snapshot
-  - cerc-io/eth-statediff-service
-  - cerc-io/ipld-eth-db
-  - cerc-io/ipld-eth-server
-containers:
-  - cerc/ipld-eth-state-snapshot
-  - cerc/eth-statediff-service
-  - cerc/ipld-eth-db
-  - cerc/ipld-eth-server
@@ -1,98 +0,0 @@
-# Gelato watcher
-
-Instructions to setup and deploy Gelato watcher using [laconic-stack-orchestrator](/README.md#install)
-
-## Setup
-
-Prerequisite: `ipld-eth-server` RPC and GQL endpoints
-
-Clone required repositories:
-
-```bash
-laconic-so --stack gelato setup-repositories
-
-# If this throws an error as a result of being already checked out to a branch/tag in a repo, remove the repositories mentioned below and re-run the command
-```
-
-Checkout to required version in the repo:
-
-```bash
-# gelato-watcher-ts
-cd ~/cerc/gelato-watcher-ts
-git checkout v0.1.0
-```
-
-Build the container images:
-
-```bash
-laconic-so --stack gelato build-containers
-```
-
-This should create the required docker images in the local image registry.
-
-## Deploy
-
-### Configuration
-
-Create and update an env file to be used in the next step ([defaults](../../config/watcher-gelato/watcher-params.env)):
-
-  ```bash
-  # External ipld-eth-server endpoints
-  CERC_IPLD_ETH_RPC=
-  CERC_IPLD_ETH_GQL=
-
-  # Whether to use a state snapshot to initialize the watcher
-  CERC_USE_STATE_SNAPSHOT=false
-
-  # State snapshot params
-  # Required if CERC_USE_STATE_SNAPSHOT is set to true
-  CERC_SNAPSHOT_GQL_ENDPOINT=
-  CERC_SNAPSHOT_BLOCKHASH=
-  ```
-
-* NOTE: If `ipld-eth-server` is running on the host machine, use `host.docker.internal` as the hostname to access the host port(s)
-
-### Deploy the stack
-
-```bash
-laconic-so --stack gelato deploy --env-file <PATH_TO_ENV_FILE> up
-```
-
-To list down and monitor the running containers:
-
-```bash
-laconic-so --stack gelato deploy ps
-
-# With status
-docker ps
-
-# Check logs for a container
-docker logs -f <CONTAINER_ID>
-```
-
-The stack runs an active watcher with following endpoints exposed on the host ports:
-* `3008`: watcher endpoint
-* `9000`: watcher metrics
-* `9001`: watcher GQL metrics
-
-## Web Apps
-
-TODO
-
-## Clean up
-
-Stop all services running in the background:
-
-```bash
-laconic-so --stack gelato deploy down
-```
-
-Clear volumes created by this stack:
-
-```bash
-# List all relevant volumes
-docker volume ls -q --filter "name=.*gelato_watcher_db_data|.*gelato_watcher_state_gql"
-
-# Remove all the listed volumes
-docker volume rm $(docker volume ls -q --filter "name=.*gelato_watcher_db_data|.*gelato_watcher_state_gql")
-```
@@ -1,8 +0,0 @@
-version: "1.0"
-name: gelato
-repos:
-  - cerc-io/gelato-watcher-ts
-containers:
-  - cerc/watcher-gelato
-pods:
-  - watcher-gelato
@@ -12,10 +12,10 @@ If running in the cloud, visit `IP:5001/webui` and you'll likely see this error:

 1. Get the container name with `docker ps`:

-2. Go into the container:
+2. Go into the container (replace with your container name):

 ```
-laconic-so --stack kubo deploy exec ipfs sh
+docker exec -it laconic-dbbf5498fd7d322930b9484121a6a5f4-ipfs-1 sh
 ```

 3. Enable CORS as described in point 2 of the error message. Copy/paste/run each line in sequence, then run `exit` to exit the container.
@@ -26,7 +26,7 @@ In addition to the pre-requisites listed in the [README](/README.md), the follow

 1. Clone this repository:
   ```
-   $ git clone https://github.com/cerc-io/stack-orchestrator.git
+   $ git clone (https://github.com/cerc-io/stack-orchestrator.git
   ```

 2. Enter the project directory:
@@ -87,27 +87,20 @@ Use shiv to build a single file Python executable zip archive of laconic-so:
   ```
   $ cp stack-orchetrator/laconic-so ~/bin
   $ laconic-so
-      Usage: laconic-so [OPTIONS] COMMAND [ARGS]...
+      Usage: python -m laconic-so [OPTIONS] COMMAND [ARGS]...

      Laconic Stack Orchestrator

   Options:
-      --stack TEXT         specify a stack to build/deploy
      --quiet
      --verbose
      --dry-run
-      --local-stack
-      --debug
-      --continue-on-error
-      -h, --help           Show this message and exit.
+      -h, --help  Show this message and exit.

   Commands:
      build-containers    build the set of containers required for a complete...
-      build-npms          build the set of npm packages required for a...
-      deploy              deploy a stack
      deploy-system       deploy a stack
      setup-repositories  git clone the set of repositories required to build...
-      version             print tool version
   ```

 For cutting releases, use the [shiv build script](/scripts/build_shiv_package.sh).
@@ -162,13 +162,7 @@ Published demo-record-1.yml with id: bafyreierh3xnfivexlscdwubvczmddsnf46uytyfvr
 The sample record we deployed looks like:

 ```
-record:
-  type: WebsiteRegistrationRecord
-  url: 'https://cerc.io'
-  repo_registration_record_cid: QmSnuWmxptJZdLJpKRarxBMS2Ju2oANVrgbr2xWbie9b2D
-  build_artifact_cid: QmP8jTG1m9GSDJLCbeWhVSVgEzCPPwXRdCRuJtQ5Tz9Kc9
-  tls_cert_cid: QmbWqxBEKC3P8tqsKc98xmWNzrzDtRLMiMPL8wBuTGsMnR
-  version: 1.0.23
+TODO
 ```

 2. Return to the laconic-console
Author	SHA1	Message	Date
prathamesh	dc3103ca84	Change delimeter while replacing deny multiaddrs list Former-commit-id: `db27b07d99`	2023-05-05 13:28:57 +05:30
prathamesh	c7cae95114	Use provided domain for relay multiaddr in peer config Former-commit-id: `164a019d69`	2023-05-05 10:27:26 +05:30
prathamesh	cc9a0a5c36	Update package versions Former-commit-id: `ff51e47dfb`	2023-05-04 20:01:38 +05:30
prathamesh	74db89c285	Add watcher config option for blacklisted multiaddrs Former-commit-id: `379332d5ec`	2023-05-04 20:00:58 +05:30
nabarun	46de299032	Add env variable for web apps config denyMultiaddrs Former-commit-id: `859a0f684f`	2023-05-04 18:42:45 +05:30