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
104 changed files with 324 additions and 1879 deletions
@@ -1,39 +0,0 @@
 name: Deploy Test
 on:
  pull_request:
    branches: '*'
  push:
    branches:
      - main
      - ci-test
 # Needed until we can incorporate docker startup into the executor container
 env:
  DOCKER_HOST: unix:///var/run/dind.sock
 jobs:
  test:
    name: "Run deploy test suite"
    runs-on: ubuntu-latest
    steps:
      - name: "Clone project repository"
        uses: actions/checkout@v3
      - name: "Install Python"
        uses: cerc-io/setup-python@v4
        with:
          python-version: '3.8'
      - name: "Print Python version"
        run: python3 --version
      - name: "Install shiv"
        run: pip install shiv
      - name: "Generate build version file"
        run: ./scripts/create_build_tag_file.sh
      - name: "Build local shiv package"
        run: ./scripts/build_shiv_package.sh
      - name: Start dockerd # Also needed until we can incorporate into the executor
        run: |
          dockerd -H $DOCKER_HOST --userland-proxy=false &
          sleep 5
      - name: "Run deploy tests"
        run: ./tests/deploy/run-deploy-test.sh
@@ -1,4 +1,4 @@
-name: Smoke Test
+name: Integration Test
 on:
  pull_request:
@@ -1,29 +0,0 @@
 name: Deploy Test
 on:
  pull_request:
    branches: '*'
  push:
    branches: '*'
 jobs:
  test:
    name: "Run deploy test suite"
    runs-on: ubuntu-latest
    steps:
      - name: "Clone project repository"
        uses: actions/checkout@v3
      - name: "Install Python"
        uses: actions/setup-python@v4
        with:
          python-version: '3.8'
      - name: "Print Python version"
        run: python3 --version
      - name: "Install shiv"
        run: pip install shiv
      - name: "Generate build version file"
        run: ./scripts/create_build_tag_file.sh
      - name: "Build local shiv package"
        run: ./scripts/build_shiv_package.sh
      - name: "Run deploy tests"
        run: ./tests/deploy/run-deploy-test.sh
@@ -1,4 +1,4 @@
-name: Smoke Test
+name: Test
 on:
  pull_request:
@@ -7,4 +7,3 @@ __pycache__
 *~
 package
 app/data/build_tag.txt
 build
@@ -90,7 +90,7 @@ def command(ctx, include, exclude, force_rebuild, extra_build_args):
        "CERC_CONTAINER_BASE_DIR": container_build_dir,
        "CERC_HOST_UID": f"{os.getuid()}",
        "CERC_HOST_GID": f"{os.getgid()}",
-        "DOCKER_BUILDKIT": config("DOCKER_BUILDKIT", default="0")
+        "DOCKER_BUILDKIT": "0"
    }
    container_build_env.update({"CERC_SCRIPT_DEBUG": "true"} if debug else {})
    container_build_env.update({"CERC_FORCE_REBUILD": "true"} if force_rebuild else {})
@@ -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:
@@ -2,7 +2,6 @@ version: '3.7'
 services:
  fixturenet-eth-bootnode-geth:
    restart: always
    hostname: fixturenet-eth-bootnode-geth
    env_file:
      - ../config/fixturenet-eth/fixturenet-eth.env
@@ -16,13 +15,12 @@ services:
      - "30303"
  fixturenet-eth-geth-1:
    restart: always
    hostname: fixturenet-eth-geth-1
    cap_add:
      - SYS_PTRACE
    environment:
      CERC_REMOTE_DEBUG: "true"
-      CERC_RUN_STATEDIFF: ${CERC_RUN_STATEDIFF:-detect}
+      CERC_RUN_STATEDIFF: "detect"
      CERC_STATEDIFF_DB_NODE_ID: 1
      CERC_SCRIPT_DEBUG: ${CERC_SCRIPT_DEBUG}
    env_file:
@@ -44,7 +42,6 @@ services:
      - "6060"
  fixturenet-eth-geth-2:
    restart: always
    hostname: fixturenet-eth-geth-2
    healthcheck:
      test: ["CMD", "nc", "-v", "localhost", "8545"]
@@ -63,14 +60,12 @@ services:
      - fixturenet_eth_geth_2_data:/root/ethdata
  fixturenet-eth-bootnode-lighthouse:
    restart: always
    hostname: fixturenet-eth-bootnode-lighthouse
    environment:
      RUN_BOOTNODE: "true"
    image: cerc/fixturenet-eth-lighthouse:local
  fixturenet-eth-lighthouse-1:
    restart: always
    hostname: fixturenet-eth-lighthouse-1
    healthcheck:
      test: ["CMD", "wget", "--tries=1", "--connect-timeout=1", "--quiet", "-O", "-", "http://localhost:8001/eth/v2/beacon/blocks/head"]
@@ -96,7 +91,6 @@ services:
      - "8001"
  fixturenet-eth-lighthouse-2:
    restart: always
    hostname: fixturenet-eth-lighthouse-2
    healthcheck:
      test: ["CMD", "wget", "--tries=1", "--connect-timeout=1", "--quiet", "-O", "-", "http://localhost:8001/eth/v2/beacon/blocks/head"]
@@ -1,11 +1,10 @@
 version: "3.2"
 services:
  laconicd:
    restart: unless-stopped
    image: cerc/laconicd:local
    command: ["sh", "/docker-entrypoint-scripts.d/create-fixturenet.sh"]
    volumes:
      # The cosmos-sdk node's database directory:
      - laconicd-data:/root/.laconicd/data
      # TODO: look at folding these scripts into the container
      - ../config/fixturenet-laconicd/create-fixturenet.sh:/docker-entrypoint-scripts.d/create-fixturenet.sh
      - ../config/fixturenet-laconicd/export-mykey.sh:/docker-entrypoint-scripts.d/export-mykey.sh
@@ -1,68 +0,0 @@
 version: "3.8"
 services:
  lotus-miner:
    hostname: lotus-miner
    env_file:
      - ../config/fixturenet-lotus/lotus-env.env
    image: cerc/lotus:local
    volumes:
      - ../config/fixturenet-lotus/setup-miner.sh:/docker-entrypoint-scripts.d/setup-miner.sh
      - ../config/fixturenet-lotus/genesis/devgen.car:/devgen.car
      - $HOME/stack-orchestrator/app/data/config/fixturenet-lotus/genesis/.genesis-sectors:/root/.genesis-sectors
      - lotus-shared:/root/.lotus-shared
    healthcheck:
 #      test: ["CMD-SHELL", "grep 'started ChainNotify channel' /var/log/lotus.log"]
 #      test: ["CMD-SHELL", "[ -f /root/.lotus-shared/miner.addr ]"]
      test: ["CMD-SHELL", "[ -d /root/.lotus-miner-local-net ]"]
      interval: 10s
      timeout: 10s
      retries: 10
      start_period: 60s
    entrypoint: ["sh", "/docker-entrypoint-scripts.d/setup-miner.sh"]
    ports:
      - "1234"
      - "2345"
      - "3456"
      - "1777"
  lotus-node-1:
    hostname: lotus-node-1
    env_file:
      - ../config/fixturenet-lotus/lotus-env.env
    image: cerc/lotus:local
    volumes:
      - ../config/fixturenet-lotus/setup-node.sh:/docker-entrypoint-scripts.d/setup-node.sh
      - ../config/fixturenet-lotus/genesis/devgen.car:/devgen.car
      - lotus-shared:/root/.lotus-shared
    depends_on:
      lotus-miner:
        condition: service_healthy
    entrypoint: ["sh", "/docker-entrypoint-scripts.d/setup-node.sh"]
    ports:
      - "1234"
      - "2345"
      - "3456"
      - "1777"
  lotus-node-2:
    hostname: lotus-node-2
    env_file:
      - ../config/fixturenet-lotus/lotus-env.env
    image: cerc/lotus:local
    volumes:
      - ../config/fixturenet-lotus/setup-node.sh:/docker-entrypoint-scripts.d/setup-node.sh
      - ../config/fixturenet-lotus/genesis/devgen.car:/devgen.car
      - lotus-shared:/root/.lotus-shared
    depends_on:
      lotus-miner:
        condition: service_healthy
    entrypoint: ["sh", "/docker-entrypoint-scripts.d/setup-node.sh"]
    ports:
      - "1234"
      - "2345"
      - "3456"
      - "1777"
 volumes:
  lotus-shared:
@@ -5,7 +5,6 @@ services:
  # Creates / updates the configuration for L1 contracts deployment
  # Deploys the L1 smart contracts (outputs to volume l1_deployment)
  fixturenet-optimism-contracts:
    restart: on-failure
    hostname: fixturenet-optimism-contracts
    image: cerc/optimism-contracts:local
    env_file:
@@ -36,7 +35,6 @@ services:
  # Generates the config files required for L2 (outputs to volume l2_config)
  op-node-l2-config-gen:
    restart: on-failure
    image: cerc/optimism-op-node:local
    depends_on:
      fixturenet-optimism-contracts:
@@ -56,7 +54,6 @@ services:
  # Initializes and runs the L2 execution client  (outputs to volume l2_geth_data)
  op-geth:
    restart: always
    image: cerc/optimism-l2geth:local
    depends_on:
      op-node-l2-config-gen:
@@ -79,7 +76,6 @@ services:
  # Runs the L2 consensus client (Sequencer node)
  op-node:
    restart: always
    image: cerc/optimism-op-node:local
    depends_on:
      op-geth:
@@ -107,7 +103,6 @@ services:
  # Runs the batcher (takes transactions from the Sequencer and publishes them to L1)
  op-batcher:
    restart: always
    image: cerc/optimism-op-batcher:local
    depends_on:
      op-node:
@@ -134,7 +129,6 @@ services:
  # Runs the proposer (periodically submits new state roots to L1)
  op-proposer:
    restart: always
    image: cerc/optimism-op-proposer:local
    depends_on:
      op-node:
@@ -1,129 +0,0 @@
 services:
  fixturenet-eth-bootnode-geth:
    restart: always
    hostname: fixturenet-eth-bootnode-geth
    env_file:
      - ../config/fixturenet-eth/fixturenet-eth.env
    environment:
      RUN_BOOTNODE: "true"
    image: cerc/fixturenet-plugeth-plugeth:local
    volumes:
      - fixturenet_plugeth_bootnode_geth_data:/root/ethdata
      - ../config/fixturenet-plugeth/plugins:/root/ethdata/plugins
    ports:
      - "9898"
      - "30303"
  fixturenet-eth-geth-1:
    restart: always
    hostname: fixturenet-eth-geth-1
    cap_add:
      - SYS_PTRACE
    environment:
      CERC_REMOTE_DEBUG: "true"
      CERC_RUN_STATEDIFF: "detect"
      CERC_STATEDIFF_DB_NODE_ID: 1
      CERC_SCRIPT_DEBUG: ${CERC_SCRIPT_DEBUG}
    env_file:
      - ../config/fixturenet-eth/fixturenet-eth.env
    image: cerc/fixturenet-plugeth-plugeth:local
    volumes:
      - fixturenet_plugeth_geth_1_data:/root/ethdata
      - ../config/fixturenet-plugeth/plugins:/root/ethdata/plugins
    healthcheck:
      test: ["CMD", "wget", "--tries=1", "--connect-timeout=1", "--quiet", "-O", "-", "http://localhost:8545/"]
      interval: 30s
      timeout: 10s
      retries: 10
      start_period: 3s
    depends_on:
      - fixturenet-eth-bootnode-geth
    ports:
      - "8545"
      - "40000"
      - "6060"
  fixturenet-eth-geth-2:
    restart: always
    hostname: fixturenet-eth-geth-2
    healthcheck:
      test: ["CMD", "wget", "--tries=1", "--connect-timeout=1", "--quiet", "-O", "-", "http://localhost:8545/"]
      interval: 30s
      timeout: 10s
      retries: 10
      start_period: 3s
    environment:
      CERC_KEEP_RUNNING_AFTER_GETH_EXIT: "true"
    env_file:
      - ../config/fixturenet-eth/fixturenet-eth.env
    image: cerc/fixturenet-plugeth-plugeth:local
    depends_on:
      - fixturenet-eth-bootnode-geth
    volumes:
      - fixturenet_plugeth_geth_2_data:/root/ethdata
      - ../config/fixturenet-plugeth/plugins:/root/ethdata/plugins
  fixturenet-eth-bootnode-lighthouse:
    restart: always
    hostname: fixturenet-eth-bootnode-lighthouse
    environment:
      RUN_BOOTNODE: "true"
    image: cerc/fixturenet-plugeth-lighthouse:local
  fixturenet-eth-lighthouse-1:
    restart: always
    hostname: fixturenet-eth-lighthouse-1
    healthcheck:
      test: ["CMD", "wget", "--tries=1", "--connect-timeout=1", "--quiet", "-O", "-", "http://localhost:8001/eth/v2/beacon/blocks/head"]
      interval: 30s
      timeout: 10s
      retries: 10
      start_period: 30s
    env_file:
      - ../config/fixturenet-eth/fixturenet-eth.env
    environment:
      NODE_NUMBER: "1"
      ETH1_ENDPOINT: "http://fixturenet-eth-geth-1:8545"
      EXECUTION_ENDPOINT: "http://fixturenet-eth-geth-1:8551"
    image: cerc/fixturenet-plugeth-lighthouse:local
    volumes:
      - fixturenet_plugeth_lighthouse_1_data:/opt/testnet/build/cl
    depends_on:
      fixturenet-eth-bootnode-lighthouse:
        condition: service_started
      fixturenet-eth-geth-1:
        condition: service_healthy
    ports:
      - "8001"
  fixturenet-eth-lighthouse-2:
    restart: always
    hostname: fixturenet-eth-lighthouse-2
    healthcheck:
      test: ["CMD", "wget", "--tries=1", "--connect-timeout=1", "--quiet", "-O", "-", "http://localhost:8001/eth/v2/beacon/blocks/head"]
      interval: 30s
      timeout: 10s
      retries: 10
      start_period: 30s
    env_file:
      - ../config/fixturenet-eth/fixturenet-eth.env
    environment:
      NODE_NUMBER: "2"
      ETH1_ENDPOINT: "http://fixturenet-eth-geth-2:8545"
      EXECUTION_ENDPOINT: "http://fixturenet-eth-geth-2:8551"
      LIGHTHOUSE_GENESIS_STATE_URL: "http://fixturenet-eth-lighthouse-1:8001/eth/v2/debug/beacon/states/0"
    image: cerc/fixturenet-plugeth-lighthouse:local
    volumes:
      - fixturenet_plugeth_lighthouse_2_data:/opt/testnet/build/cl
    depends_on:
      fixturenet-eth-bootnode-lighthouse:
        condition: service_started
      fixturenet-eth-geth-2:
        condition: service_healthy
 volumes:
  fixturenet_plugeth_bootnode_geth_data:
  fixturenet_plugeth_geth_1_data:
  fixturenet_plugeth_geth_2_data:
  fixturenet_plugeth_lighthouse_1_data:
  fixturenet_plugeth_lighthouse_2_data:
@@ -1,7 +1,6 @@
 # Add-on pod to include foundry tooling within a fixturenet
 services:
  foundry:
    restart: always
    image: cerc/foundry:local
    command: ["while :; do sleep 600; done"]
    volumes:
@@ -7,9 +7,11 @@ services:
        condition: service_healthy
    image: cerc/ipld-eth-server:local
    environment:
-      SERVER_HTTP_PATH: 0.0.0.0:8081
+      IPLD_SERVER_GRAPHQL: "true"
-      SERVER_GRAPHQL: "true"
+      IPLD_POSTGRAPHILEPATH: http://graphql:5000
-      SERVER_GRAPHQLPATH: 0.0.0.0:8082
+      ETH_SERVER_HTTPPATH: 0.0.0.0:8081
      ETH_SERVER_GRAPHQL: "true"
      ETH_SERVER_GRAPHQLPATH: 0.0.0.0:8082
      VDB_COMMAND: "serve"
      ETH_CHAIN_CONFIG: "/tmp/chain.json"
      DATABASE_NAME: cerc_testing
@@ -1,13 +1,7 @@
 version: "3.2"
 services:
  test:
    image: cerc/test-container:local
    restart: always
    environment:
      CERC_SCRIPT_DEBUG: ${CERC_SCRIPT_DEBUG}
    volumes:
      - test-data:/var
    ports:
      - "80"
 volumes:
  test-data:
@@ -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:
@@ -17,8 +17,7 @@ CERC_STATEDIFF_DB_PORT=5432
 CERC_STATEDIFF_DB_NAME="cerc_testing"
 CERC_STATEDIFF_DB_USER="vdbm"
 CERC_STATEDIFF_DB_PASSWORD="password"
-CERC_STATEDIFF_DB_GOOSE_MIN_VER=${CERC_STATEDIFF_DB_GOOSE_MIN_VER:-18}
+CERC_STATEDIFF_DB_GOOSE_MIN_VER=23
 CERC_STATEDIFF_DB_LOG_STATEMENTS="false"
 CERC_STATEDIFF_WORKERS=2
 CERC_GETH_VMODULE="statediff/*=5,rpc/*=5"
@@ -1 +0,0 @@
 }+V�{iνΆΠΉ�²�¨ΣΗ\k»qς␍—?δΪAΒfκ’~μ©™LΉ�tb·yqτ·²ηξΔ�Ο?ξaΣ�J
@@ -1 +0,0 @@
 Βfκ’~μ©™LΉ�tb·yqτ·²ηξΔ�Ο?ξaΣ�J
@@ -1,71 +0,0 @@
 {
  "t01000": {
    "ID": "t01000",
    "Owner": "t3spusn5ia57qezc3fwpe3n2lhb4y4xt67xoflqbqy2muliparw2uktevletuv7gl4qakjpafgcl7jk2s2er3q",
    "Worker": "t3spusn5ia57qezc3fwpe3n2lhb4y4xt67xoflqbqy2muliparw2uktevletuv7gl4qakjpafgcl7jk2s2er3q",
    "PeerId": "12D3KooWG5q6pWJVdPBhDBv9AjWVbUh4xxTAZ7xvgZSjczWuD2Z9",
    "MarketBalance": "0",
    "PowerBalance": "0",
    "SectorSize": 2048,
    "Sectors": [
      {
        "CommR": {
          "/": "bagboea4b5abcboxypcewlkmrat2myu4vthk3ii2pcomak7nhqmdbb6sxlolp2wdf"
        },
        "CommD": {
          "/": "baga6ea4seaqn3jfixthmdgksv4vhfeuyvr6upw6tvaqbmzmsyxnzosm4pwgnmlq"
        },
        "SectorID": 0,
        "Deal": {
          "PieceCID": {
            "/": "baga6ea4seaqn3jfixthmdgksv4vhfeuyvr6upw6tvaqbmzmsyxnzosm4pwgnmlq"
          },
          "PieceSize": 2048,
          "VerifiedDeal": false,
          "Client": "t3spusn5ia57qezc3fwpe3n2lhb4y4xt67xoflqbqy2muliparw2uktevletuv7gl4qakjpafgcl7jk2s2er3q",
          "Provider": "t01000",
          "Label": "0",
          "StartEpoch": 0,
          "EndEpoch": 9001,
          "StoragePricePerEpoch": "0",
          "ProviderCollateral": "0",
          "ClientCollateral": "0"
        },
        "DealClientKey": {
          "Type": "bls",
          "PrivateKey": "tFvSRiSg2G3Ssgg0PSYy23XyjaIMXpsmdyG2B7UFLT4="
        },
        "ProofType": 5
      },
      {
        "CommR": {
          "/": "bagboea4b5abcb6krzypqcczhcnbeyjcqkeo6omfergm336o3kitugh3jgjog2yqq"
        },
        "CommD": {
          "/": "baga6ea4seaqhondpb2373hjasjplxvbjzi5n5mm4fbbhjxp5ptnbq4cibapkeii"
        },
        "SectorID": 1,
        "Deal": {
          "PieceCID": {
            "/": "baga6ea4seaqhondpb2373hjasjplxvbjzi5n5mm4fbbhjxp5ptnbq4cibapkeii"
          },
          "PieceSize": 2048,
          "VerifiedDeal": false,
          "Client": "t3spusn5ia57qezc3fwpe3n2lhb4y4xt67xoflqbqy2muliparw2uktevletuv7gl4qakjpafgcl7jk2s2er3q",
          "Provider": "t01000",
          "Label": "1",
          "StartEpoch": 0,
          "EndEpoch": 9001,
          "StoragePricePerEpoch": "0",
          "ProviderCollateral": "0",
          "ClientCollateral": "0"
        },
        "DealClientKey": {
          "Type": "bls",
          "PrivateKey": "tFvSRiSg2G3Ssgg0PSYy23XyjaIMXpsmdyG2B7UFLT4="
        },
        "ProofType": 5
      }
    ]
  }
 }
@@ -1 +0,0 @@
 7b2254797065223a22626c73222c22507269766174654b6579223a227446765352695367324733537367673050535979323358796a61494d5870736d64794732423755464c54343d227d
@@ -1,11 +0,0 @@
 {
  "ID": "f355523e-69d0-4984-bd0e-9588487c6231",
  "Weight": 0,
  "CanSeal": false,
  "CanStore": false,
  "MaxStorage": 0,
  "Groups": null,
  "AllowTo": null,
  "AllowTypes": null,
  "DenyTypes": null
 }
@@ -1,108 +0,0 @@
 {
  "NetworkVersion": 18,
  "Accounts": [
    {
      "Type": "account",
      "Balance": "50000000000000000000000000",
      "Meta": {
        "Owner": "t3spusn5ia57qezc3fwpe3n2lhb4y4xt67xoflqbqy2muliparw2uktevletuv7gl4qakjpafgcl7jk2s2er3q"
      }
    }
  ],
  "Miners": [
    {
      "ID": "t01000",
      "Owner": "t3spusn5ia57qezc3fwpe3n2lhb4y4xt67xoflqbqy2muliparw2uktevletuv7gl4qakjpafgcl7jk2s2er3q",
      "Worker": "t3spusn5ia57qezc3fwpe3n2lhb4y4xt67xoflqbqy2muliparw2uktevletuv7gl4qakjpafgcl7jk2s2er3q",
      "PeerId": "12D3KooWG5q6pWJVdPBhDBv9AjWVbUh4xxTAZ7xvgZSjczWuD2Z9",
      "MarketBalance": "0",
      "PowerBalance": "0",
      "SectorSize": 2048,
      "Sectors": [
        {
          "CommR": {
            "/": "bagboea4b5abcboxypcewlkmrat2myu4vthk3ii2pcomak7nhqmdbb6sxlolp2wdf"
          },
          "CommD": {
            "/": "baga6ea4seaqn3jfixthmdgksv4vhfeuyvr6upw6tvaqbmzmsyxnzosm4pwgnmlq"
          },
          "SectorID": 0,
          "Deal": {
            "PieceCID": {
              "/": "baga6ea4seaqn3jfixthmdgksv4vhfeuyvr6upw6tvaqbmzmsyxnzosm4pwgnmlq"
            },
            "PieceSize": 2048,
            "VerifiedDeal": false,
            "Client": "t3spusn5ia57qezc3fwpe3n2lhb4y4xt67xoflqbqy2muliparw2uktevletuv7gl4qakjpafgcl7jk2s2er3q",
            "Provider": "t01000",
            "Label": "0",
            "StartEpoch": 0,
            "EndEpoch": 9001,
            "StoragePricePerEpoch": "0",
            "ProviderCollateral": "0",
            "ClientCollateral": "0"
          },
          "DealClientKey": {
            "Type": "bls",
            "PrivateKey": "tFvSRiSg2G3Ssgg0PSYy23XyjaIMXpsmdyG2B7UFLT4="
          },
          "ProofType": 5
        },
        {
          "CommR": {
            "/": "bagboea4b5abcb6krzypqcczhcnbeyjcqkeo6omfergm336o3kitugh3jgjog2yqq"
          },
          "CommD": {
            "/": "baga6ea4seaqhondpb2373hjasjplxvbjzi5n5mm4fbbhjxp5ptnbq4cibapkeii"
          },
          "SectorID": 1,
          "Deal": {
            "PieceCID": {
              "/": "baga6ea4seaqhondpb2373hjasjplxvbjzi5n5mm4fbbhjxp5ptnbq4cibapkeii"
            },
            "PieceSize": 2048,
            "VerifiedDeal": false,
            "Client": "t3spusn5ia57qezc3fwpe3n2lhb4y4xt67xoflqbqy2muliparw2uktevletuv7gl4qakjpafgcl7jk2s2er3q",
            "Provider": "t01000",
            "Label": "1",
            "StartEpoch": 0,
            "EndEpoch": 9001,
            "StoragePricePerEpoch": "0",
            "ProviderCollateral": "0",
            "ClientCollateral": "0"
          },
          "DealClientKey": {
            "Type": "bls",
            "PrivateKey": "tFvSRiSg2G3Ssgg0PSYy23XyjaIMXpsmdyG2B7UFLT4="
          },
          "ProofType": 5
        }
      ]
    }
  ],
  "NetworkName": "localnet-6d52dae5-ff29-4bac-a45d-f84e6c07564c",
  "VerifregRootKey": {
    "Type": "multisig",
    "Balance": "0",
    "Meta": {
      "Signers": [
        "t1ceb34gnsc6qk5dt6n7xg6ycwzasjhbxm3iylkiy"
      ],
      "Threshold": 1,
      "VestingDuration": 0,
      "VestingStart": 0
    }
  },
  "RemainderAccount": {
    "Type": "multisig",
    "Balance": "0",
    "Meta": {
      "Signers": [
        "t1ceb34gnsc6qk5dt6n7xg6ycwzasjhbxm3iylkiy"
      ],
      "Threshold": 1,
      "VestingDuration": 0,
      "VestingStart": 0
    }
  }
 }
@@ -1,5 +0,0 @@
 LOTUS_PATH=~/.lotus-local-net
 LOTUS_MINER_PATH=~/.lotus-miner-local-net
 LOTUS_SKIP_GENESIS_CHECK=_yes_
 CGO_CFLAGS_ALLOW="-D__BLST_PORTABLE__"
 CGO_CFLAGS="-D__BLST_PORTABLE__"
@@ -1,39 +0,0 @@
 #!/bin/bash
 lotus --version
 # # remove old bootnode peer info if present
 # [ -f /root/.lotus-shared/miner.addr ] && rm /root/.lotus-shared/miner.addr
 ##TODO: generate genesis files inside container instead of bundling in config dir
 ##something like commands below should work, other scripts/compose will have to be updated to corresponding directories
 # lotus fetch-params 2048
 # lotus-seed pre-seal --sector-size 2KiB --num-sectors 2
 # lotus-seed genesis new localnet.json
 # lotus-seed genesis add-miner localnet.json ~/.genesis-sectors/pre-seal-t01000.json
 # start daemon
 nohup lotus daemon  --genesis=/devgen.car --profile=bootstrapper --bootstrap=false > /var/log/lotus.log 2>&1 &
 # Loop until the daemon is started
 echo "Waiting for daemon to start..."
 while ! grep -q "started ChainNotify channel" /var/log/lotus.log ; do
    sleep 5
 done
 echo "Daemon started."
 # publish bootnode peer info to shared volume
 lotus net listen | awk 'NR==1{print}' > /root/.lotus-shared/miner.addr
 # if miner not already initialized
 if [ ! -d /root/.lotus-miner-local-net ]; then
  # initialize miner
  lotus wallet import --as-default ~/.genesis-sectors/pre-seal-t01000.key
  lotus-miner init --genesis-miner --actor=t01000 --sector-size=2KiB --pre-sealed-sectors=~/.genesis-sectors --pre-sealed-metadata=~/.genesis-sectors/pre-seal-t01000.json --nosync
 fi
 # start miner
 nohup lotus-miner run --nosync &
 tail -f /dev/null
@@ -1,24 +0,0 @@
 #!/bin/bash
 lotus --version
 ##TODO: paths can use values from lotus-env.env file
 # if not already initialized
 if [ ! -f /root/.lotus-local-net/config.toml ]; then
  # init node config
  mkdir $HOME/.lotus-local-net
  lotus config default > $HOME/.lotus-local-net/config.toml
  # add bootstrap peer info if available
  if [ -f /root/.lotus-shared/miner.addr ]; then
    MINER_ADDR=\"$(cat /root/.lotus-shared/miner.addr)\"
    # add bootstrap peer id to config file
    sed -i "/^\[Libp2p\]/a \ \ BootstrapPeers = [$MINER_ADDR]" $HOME/.lotus-local-net/config.toml
  else
    echo "Bootstrap peer info not found, unable to configure. Manual peering will be required."
  fi
 fi
 # start node
 lotus daemon --genesis=/devgen.car
@@ -1 +0,0 @@
 See: https://docs.plugeth.org/
@@ -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=
@@ -27,8 +27,8 @@ yarn_info_output=$(yarn info --json $versioned_target_package 2>/dev/null)
 # If it doesn't exist there will be no .data.dist.tarball element,
 # and jq will output the string "null"
 package_tarball=$(echo $yarn_info_output | jq -r .data.dist.tarball)
-if [[ "$yarn_info_output" == "" ||  $package_tarball == "null" ]]; then
+if [[ $package_tarball == "null" ]]; then
-    echo "FATAL: Target package version ($versioned_target_package) not found (or bad npm auth token)" >&2
+    echo "FATAL: Target package version ($versioned_target_package) not found" >&2
    exit 1
 fi
 # Code below parses out the values we need
@@ -6,7 +6,7 @@ RUN go install github.com/go-delve/delve/cmd/dlv@latest
 FROM cerc/go-ethereum:local as geth
-FROM alpine:3.17
+FROM alpine:latest
 RUN apk add --no-cache python3 python3-dev py3-pip curl wget jq build-base gettext libintl openssl bash bind-tools postgresql-client
 COPY --from=delve  /go/bin/dlv /usr/local/bin/
@@ -22,18 +22,6 @@ COPY run-el.sh /opt/testnet/run.sh
 RUN cd /opt/testnet && make genesis-el
 COPY --from=geth  /usr/local/bin/geth /usr/local/bin/
 # Snag the genesis block info.
 RUN geth --datadir ~/ethdata init /opt/testnet/build/el/geth.json && rm -f ~/ethdata/geth/nodekey
 RUN cp -rp ~/ethdata ~/tmpeth && \
    geth --datadir ~/tmpeth init /opt/testnet/build/el/geth.json && \
    geth --datadir ~/tmpeth --http & \
    sleep 5 && \
    curl -q --location 'localhost:8545' \
        --header 'Content-Type: application/json' \
        --data '{ "jsonrpc": "2.0", "id": 14, "method": "eth_getBlockByNumber", "params": ["0x0", false] }' \
        -o /opt/testnet/build/el/genesis_block.json && \
    killall -9 geth && \
    rm -rf ~/tmpeth
 ENTRYPOINT ["/opt/testnet/run.sh"]
@@ -34,7 +34,5 @@ python3 /apps/el-gen/genesis_geth.py $tmp_dir/genesis-config.yaml | \
  jq ".config.istanbulBlock=$istanbul_block" | \
  jq ".config.berlinBlock=$berlin_block" | \
  jq ".config.londonBlock=$london_block" | \
-  jq ".config.mergeForkBlock=$merge_fork_block" | \
+  jq ".config.mergeForkBlock=$merge_fork_block" > ../build/el/geth.json
  jq ".config.mergeNetsplitBlock=$merge_fork_block" \
  > ../build/el/geth.json
 python3 ../accounts/mnemonic_to_csv.py $tmp_dir/genesis-config.yaml > ../build/el/accounts.csv
@@ -64,8 +64,8 @@ else
    STATEDIFF_OPTS=""
    if [ "$CERC_RUN_STATEDIFF" == "true" ]; then
      ready=0
      echo "Waiting for statediff DB..."
      while [ $ready -eq 0 ]; do
        echo "Waiting for statediff DB..."
        sleep 1
        export PGPASSWORD="$CERC_STATEDIFF_DB_PASSWORD"
        result=$(psql -h "$CERC_STATEDIFF_DB_HOST" \
@@ -73,13 +73,9 @@ else
          -U "$CERC_STATEDIFF_DB_USER" \
          -d "$CERC_STATEDIFF_DB_NAME" \
          -t -c 'select max(version_id) from goose_db_version;' 2>/dev/null | awk '{ print $1 }')
-        if [ -n "$result" ]; then
+        if [ -n "$result" ] && [ $result -ge $CERC_STATEDIFF_DB_GOOSE_MIN_VER ]; then
          echo "DB ready..."
-          if [ $result -ge $CERC_STATEDIFF_DB_GOOSE_MIN_VER ]; then
+          ready=1
            ready=1
          else
            echo "DB not at required version (want $CERC_STATEDIFF_DB_GOOSE_MIN_VER, have $result)"
          fi
        fi
      done
      STATEDIFF_OPTS="--statediff=true \
@@ -92,7 +88,6 @@ else
      --statediff.db.logstatements=${CERC_STATEDIFF_DB_LOG_STATEMENTS:-false} \
      --statediff.db.copyfrom=${CERC_STATEDIFF_DB_COPY_FROM:-true} \
      --statediff.waitforsync=true \
      --statediff.workers=${CERC_STATEDIFF_WORKERS:-1} \
      --statediff.writing=true"
    fi
@@ -1,4 +1,4 @@
-FROM cerc/lighthouse-cli:local AS lcli
+FROM sigp/lcli:v4.1.0 AS lcli
 FROM skylenet/ethereum-genesis-generator@sha256:210353ce7c898686bc5092f16c61220a76d357f51eff9c451e9ad1b9ad03d4d3 AS ethgen
 FROM cerc/fixturenet-eth-geth:local AS fnetgeth
@@ -13,26 +13,22 @@ DEBUG_LEVEL=${1:-info}
 echo "Starting bootnode"
-# Clean up existing ENR dir to avoid node connectivity issues on a restart
+if [ ! -f "$DATADIR/bootnode/enr.dat" ]; then
-if [ -d "$DATADIR/bootnode" ]; then
+  echo "Generating bootnode enr"
-  echo "Removing existing bootnode enr directory"
+  lcli \
-  rm -r "$DATADIR/bootnode"
+    generate-bootnode-enr \
    --ip $ENR_IP \
    --udp-port $BOOTNODE_PORT \
    --tcp-port $BOOTNODE_PORT \
    --genesis-fork-version $GENESIS_FORK_VERSION \
    --output-dir $DATADIR/bootnode
  bootnode_enr=`cat $DATADIR/bootnode/enr.dat`
  echo "- $bootnode_enr" > $TESTNET_DIR/boot_enr.yaml
  echo "Generated bootnode enr and written to $TESTNET_DIR/boot_enr.yaml"
 fi
 echo "Generating bootnode enr"
 lcli \
  generate-bootnode-enr \
  --ip $ENR_IP \
  --udp-port $BOOTNODE_PORT \
  --tcp-port $BOOTNODE_PORT \
  --genesis-fork-version $GENESIS_FORK_VERSION \
  --output-dir $DATADIR/bootnode
 bootnode_enr=`cat $DATADIR/bootnode/enr.dat`
 echo "- $bootnode_enr" > $TESTNET_DIR/boot_enr.yaml
 echo "Generated bootnode enr and written to $TESTNET_DIR/boot_enr.yaml"
 exec lighthouse boot_node \
    --testnet-dir $TESTNET_DIR \
    --port $BOOTNODE_PORT \
@@ -27,14 +27,12 @@ lcli \
  --deposit-contract-address $ETH1_DEPOSIT_CONTRACT_ADDRESS \
  --testnet-dir $TESTNET_DIR \
  --min-genesis-active-validator-count $GENESIS_VALIDATOR_COUNT \
  --validator-count $VALIDATOR_COUNT \
  --min-genesis-time $GENESIS_TIME \
  --genesis-delay $GENESIS_DELAY \
  --genesis-fork-version $GENESIS_FORK_VERSION \
  --altair-fork-epoch $ALTAIR_FORK_EPOCH \
-  --bellatrix-fork-epoch $MERGE_FORK_EPOCH \
+  --merge-fork-epoch $MERGE_FORK_EPOCH \
  --eth1-id $ETH1_CHAIN_ID \
  --eth1-block-hash $ETH1_BLOCK_HASH \
  --eth1-follow-distance 1 \
  --seconds-per-slot $SECONDS_PER_SLOT \
  --seconds-per-eth1-block $SECONDS_PER_ETH1_BLOCK \
@@ -15,6 +15,9 @@ GENESIS_VALIDATOR_COUNT=${GENESIS_VALIDATOR_COUNT:-80}
 # Number of beacon_node instances that you intend to run
 BN_COUNT=${BN_COUNT:-2}
 # Number of validator clients
 VC_COUNT=${VC_COUNT:-$BN_COUNT}
 # Number of seconds to delay to start genesis block.
 # If started by a script this can be 0, if starting by hand
 # use something like 180.
@@ -42,9 +45,7 @@ VC_ARGS=${VC_ARGS:-""}
 EXECUTION_ENDPOINT=${EXECUTION_ENDPOINT:-http://localhost:8551}
 ETH1_GENESIS_JSON=${ETH1_GENESIS_JSON:-"../build/el/geth.json"}
 ETH1_GENESIS_BLOCK_JSON=${ETH1_GENESIS_BLOCK_JSON:-"../build/el/genesis_block.json"}
 ETH1_CONFIG_YAML=${ETH1_CONFIG_YAML:-"../el/el-config.yaml"}
 ETH1_BLOCK_HASH=${ETH1_BLOCK_HASH:-`cat $ETH1_GENESIS_BLOCK_JSON | jq -r '.result.hash' | cut -d'x' -f2`}
 ETH1_CHAIN_ID=${ETH1_CHAIN_ID:-`cat $ETH1_GENESIS_JSON | jq -r '.config.chainId'`}
 ETH1_TTD=${ETH1_TTD:-`cat $ETH1_GENESIS_JSON | jq -r '.config.terminalTotalDifficulty'`}
@@ -4,14 +4,7 @@ if [ -n "$CERC_SCRIPT_DEBUG" ]; then
 fi
 MIN_BLOCK_NUM=${1:-${MIN_BLOCK_NUM:-3}}
-STATUSES=(
+STATUSES=("geth to generate DAG" "beacon phase0" "beacon altair" "beacon bellatrix pre-merge" "beacon bellatrix merge" "block number $MIN_BLOCK_NUM")
  "geth to generate DAG"
  "beacon phase0"
  "beacon altair"
  "beacon bellatrix pre-merge"
  "beacon bellatrix merge"
  "block number $MIN_BLOCK_NUM"
 )
 STATUS=0
 LIGHTHOUSE_BASE_URL=${LIGHTHOUSE_BASE_URL}
@@ -43,6 +36,7 @@ MARKER="."
 function inc_status() {
  echo " done"
  MARKEr="."
  STATUS=$((STATUS + 1))
  if [ $STATUS -lt ${#STATUSES[@]} ]; then
    echo -n "Waiting for ${STATUSES[$STATUS]}..."
@@ -1,27 +0,0 @@
 FROM skylenet/ethereum-genesis-generator@sha256:210353ce7c898686bc5092f16c61220a76d357f51eff9c451e9ad1b9ad03d4d3 AS ethgen
 FROM golang:1.19.4-bullseye AS delve
 RUN go install github.com/go-delve/delve/cmd/dlv@latest
 FROM ubuntu:22.04
 RUN apt-get update && \
      apt-get install -y --no-install-recommends \
        python3 python3-dev python3-pip curl wget jq gettext gettext-base openssl bash dnsutils postgresql-client make iproute2 netcat && \
      rm -rf /var/lib/apt/lists/*
 COPY --from=delve  /go/bin/dlv /usr/local/bin/
 COPY --from=ethgen /usr/local/bin/eth2-testnet-genesis /usr/local/bin/
 COPY --from=ethgen /usr/local/bin/eth2-val-tools /usr/local/bin/
 COPY --from=ethgen /apps /apps
 RUN wget -O /usr/local/bin/geth https://github.com/openrelayxyz/plugeth/releases/download/v1.11.6.1.0/geth-linux-amd64-v1.1.0-v1.11.6.1.0 && chmod a+x /usr/local/bin/geth
 RUN cd /apps/el-gen && pip3 install -r requirements.txt
 COPY genesis /opt/testnet
 COPY run-el.sh /opt/testnet/run.sh
 RUN cd /opt/testnet && make genesis-el
 RUN geth --datadir ~/ethdata init /opt/testnet/build/el/geth.json && rm -f ~/ethdata/geth/nodekey
 ENTRYPOINT ["/opt/testnet/run.sh"]
@@ -1,17 +0,0 @@
 #!/usr/bin/env bash
 # Build cerc/fixturenet-eth-plugeth
 set -x
 source ${CERC_CONTAINER_BASE_DIR}/build-base.sh
 SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 if [ ! -d "${SCRIPT_DIR}/genesis" ]; then
  cp -frp ${SCRIPT_DIR}/../cerc-fixturenet-eth-geth/genesis ${SCRIPT_DIR}/genesis
 fi
 if [ ! -d "${SCRIPT_DIR}/run-el.sh" ]; then
  cp -fp ${SCRIPT_DIR}/../cerc-fixturenet-eth-geth/run-el.sh ${SCRIPT_DIR}/
 fi
 docker build -t cerc/fixturenet-eth-plugeth:local -f ${SCRIPT_DIR}/Dockerfile ${build_command_args} $SCRIPT_DIR
@@ -1,34 +0,0 @@
 FROM cerc/lighthouse-cli:local AS lcli
 FROM skylenet/ethereum-genesis-generator@sha256:210353ce7c898686bc5092f16c61220a76d357f51eff9c451e9ad1b9ad03d4d3 AS ethgen
 FROM cerc/fixturenet-plugeth-plugeth:local AS fnetgeth
 FROM cerc/lighthouse:local
 # cerc/lighthouse is based on Ubuntu
 RUN apt-get update && apt-get -y upgrade && apt-get install -y --no-install-recommends \
  libssl-dev ca-certificates \
  curl socat iproute2 telnet wget jq \
  build-essential python3 python3-dev python3-pip gettext-base \
  && apt-get clean \
  && rm -rf /var/lib/apt/lists/*
 COPY genesis /opt/testnet
 COPY run-cl.sh /opt/testnet/run.sh
 COPY --from=lcli /usr/local/bin/lcli /usr/local/bin/lcli
 COPY --from=ethgen /usr/local/bin/eth2-testnet-genesis /usr/local/bin/eth2-testnet-genesis
 COPY --from=ethgen /usr/local/bin/eth2-val-tools /usr/local/bin/eth2-val-tools
 COPY --from=ethgen /apps /apps
 COPY --from=fnetgeth /opt/testnet/el /opt/testnet/el
 COPY --from=fnetgeth /opt/testnet/build/el /opt/testnet/build/el
 RUN cd /opt/testnet && make genesis-cl
 # Work around some bugs in lcli where the default path is always used.
 RUN mkdir -p /root/.lighthouse && cd /root/.lighthouse && ln -s /opt/testnet/build/cl/testnet
 RUN mkdir -p /scripts
 COPY scripts/status-internal.sh /scripts
 COPY scripts/status.sh /scripts
 ENTRYPOINT ["/opt/testnet/run.sh"]
@@ -1,20 +0,0 @@
 #!/usr/bin/env bash
 # Build cerc/fixturenet-plugeth-lighthouse
 source ${CERC_CONTAINER_BASE_DIR}/build-base.sh
 SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 if [ ! -d "${SCRIPT_DIR}/genesis" ]; then
  cp -frp ${SCRIPT_DIR}/../cerc-fixturenet-eth-lighthouse/genesis ${SCRIPT_DIR}/genesis
 fi
 if [ ! -e "${SCRIPT_DIR}/run-cl.sh" ]; then
  cp -fp ${SCRIPT_DIR}/../cerc-fixturenet-eth-lighthouse/run-cl.sh ${SCRIPT_DIR}/
 fi
 if [ ! -d "${SCRIPT_DIR}/scripts" ]; then
  cp -frp ${SCRIPT_DIR}/../cerc-fixturenet-eth-lighthouse/scripts ${SCRIPT_DIR}/
 fi
 docker build -t cerc/fixturenet-plugeth-lighthouse:local -f ${SCRIPT_DIR}/Dockerfile ${build_command_args} $SCRIPT_DIR
@@ -1,40 +0,0 @@
 FROM skylenet/ethereum-genesis-generator@sha256:210353ce7c898686bc5092f16c61220a76d357f51eff9c451e9ad1b9ad03d4d3 AS ethgen
 FROM golang:1.19.4-bullseye AS delve
 RUN go install github.com/go-delve/delve/cmd/dlv@latest
 FROM ubuntu:22.04
 RUN apt-get update && \
      apt-get install -y --no-install-recommends \
        python3 python3-dev python3-pip curl wget jq gettext gettext-base openssl bash dnsutils postgresql-client make iproute2 netcat psmisc && \
      rm -rf /var/lib/apt/lists/*
 COPY --from=delve  /go/bin/dlv /usr/local/bin/
 COPY --from=ethgen /usr/local/bin/eth2-testnet-genesis /usr/local/bin/
 COPY --from=ethgen /usr/local/bin/eth2-val-tools /usr/local/bin/
 COPY --from=ethgen /apps /apps
 RUN wget -O /usr/local/bin/geth https://github.com/openrelayxyz/plugeth/releases/download/v1.11.6.1.0/geth-linux-amd64-v1.1.0-v1.11.6.1.0 && chmod a+x /usr/local/bin/geth
 RUN cd /apps/el-gen && pip3 install -r requirements.txt
 COPY genesis /opt/testnet
 COPY run-el.sh /opt/testnet/run.sh
 RUN cd /opt/testnet && make genesis-el
 RUN geth --datadir ~/ethdata init /opt/testnet/build/el/geth.json && rm -f ~/ethdata/geth/nodekey
 # Snag the genesis block info.
 RUN geth --datadir ~/ethdata init /opt/testnet/build/el/geth.json && rm -f ~/ethdata/geth/nodekey
 RUN cp -rp ~/ethdata ~/tmpeth && \
    geth --datadir ~/tmpeth init /opt/testnet/build/el/geth.json && \
    geth --datadir ~/tmpeth --http & \
    sleep 5 && \
    curl -q --location 'localhost:8545' \
        --header 'Content-Type: application/json' \
        --data '{ "jsonrpc": "2.0", "id": 14, "method": "eth_getBlockByNumber", "params": ["0x0", false] }' \
        -o /opt/testnet/build/el/genesis_block.json && \
    killall -9 geth && \
    rm -rf ~/tmpeth
 ENTRYPOINT ["/opt/testnet/run.sh"]
@@ -1,17 +0,0 @@
 #!/usr/bin/env bash
 # Build cerc/fixturenet-plugeth-plugeth
 set -x
 source ${CERC_CONTAINER_BASE_DIR}/build-base.sh
 SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 if [ ! -d "${SCRIPT_DIR}/genesis" ]; then
  cp -frp ${SCRIPT_DIR}/../cerc-fixturenet-eth-geth/genesis ${SCRIPT_DIR}/genesis
 fi
 if [ ! -e "${SCRIPT_DIR}/run-el.sh" ]; then
  cp -fp ${SCRIPT_DIR}/../cerc-fixturenet-eth-geth/run-el.sh ${SCRIPT_DIR}/
 fi
 docker build -t cerc/fixturenet-plugeth-plugeth:local -f ${SCRIPT_DIR}/Dockerfile ${build_command_args} $SCRIPT_DIR
@@ -16,7 +16,7 @@ db-waitforsync=bool   Should the statediff service start once geth has synced to
 rpc-port=port         change RPC port (default: 8545)
 rpc-addr=address      change RPC address (default: 127.0.0.1)
 chain-id=number       change chain ID (default: 99)
-extra-args=name       extra args to pass to geth on startup
+extra-args=name        extra args to pass to geth on startup
 period=seconds        use a block time instead of instamine
 accounts=number       create multiple accounts (default: 1)
 address=address       eth address to add to genesis
@@ -1,7 +0,0 @@
 #!/usr/bin/env bash
 # Build cerc/lighthouse-cli
 source ${CERC_CONTAINER_BASE_DIR}/build-base.sh
 project_dir=${CERC_REPO_BASE_DIR}/lighthouse
 docker build -t cerc/lighthouse-cli:local --build-arg PORTABLE=true -f ${project_dir}/lcli/Dockerfile ${build_command_args} ${project_dir}
@@ -1,5 +1,4 @@
-ARG TAG_SUFFIX="-modern"
+FROM sigp/lighthouse:v4.1.0-modern
 FROM sigp/lighthouse:v4.1.0${TAG_SUFFIX}
 RUN apt-get update; apt-get install bash netcat curl less jq -y;
@@ -1,138 +0,0 @@
 #####################################
 FROM golang:1.19.7-buster AS lotus-builder
 MAINTAINER Lotus Development Team
 RUN apt-get update && apt-get install -y ca-certificates build-essential clang ocl-icd-opencl-dev ocl-icd-libopencl1 jq libhwloc-dev
 ENV XDG_CACHE_HOME="/tmp"
 ### taken from https://github.com/rust-lang/docker-rust/blob/master/1.63.0/buster/Dockerfile
 ENV RUSTUP_HOME=/usr/local/rustup \
    CARGO_HOME=/usr/local/cargo \
    PATH=/usr/local/cargo/bin:$PATH \
    RUST_VERSION=1.63.0
 RUN set -eux; \
    dpkgArch="$(dpkg --print-architecture)"; \
    case "${dpkgArch##*-}" in \
        amd64) rustArch='x86_64-unknown-linux-gnu'; rustupSha256='5cc9ffd1026e82e7fb2eec2121ad71f4b0f044e88bca39207b3f6b769aaa799c' ;; \
        arm64) rustArch='aarch64-unknown-linux-gnu'; rustupSha256='e189948e396d47254103a49c987e7fb0e5dd8e34b200aa4481ecc4b8e41fb929' ;; \
        *) echo >&2 "unsupported architecture: ${dpkgArch}"; exit 1 ;; \
    esac; \
    url="https://static.rust-lang.org/rustup/archive/1.25.1/${rustArch}/rustup-init"; \
    wget "$url"; \
    echo "${rustupSha256} *rustup-init" | sha256sum -c -; \
    chmod +x rustup-init; \
    ./rustup-init -y --no-modify-path --profile minimal --default-toolchain $RUST_VERSION --default-host ${rustArch}; \
    rm rustup-init; \
    chmod -R a+w $RUSTUP_HOME $CARGO_HOME; \
    rustup --version; \
    cargo --version; \
    rustc --version;
 COPY ./ /opt/filecoin
 WORKDIR /opt/filecoin
 #RUN scripts/docker-git-state-check.sh
 ### make configurable filecoin-ffi build
 ARG FFI_BUILD_FROM_SOURCE=0
 ENV FFI_BUILD_FROM_SOURCE=${FFI_BUILD_FROM_SOURCE}
 RUN make clean deps
 ARG RUSTFLAGS=""
 ARG GOFLAGS=""
 #RUN make buildall
 RUN make 2k
 #####################################
 FROM ubuntu:20.04 AS lotus-base
 MAINTAINER Lotus Development Team
 # Base resources
 COPY --from=lotus-builder /etc/ssl/certs                           /etc/ssl/certs
 COPY --from=lotus-builder /lib/*/libdl.so.2         /lib/
 COPY --from=lotus-builder /lib/*/librt.so.1         /lib/
 COPY --from=lotus-builder /lib/*/libgcc_s.so.1      /lib/
 COPY --from=lotus-builder /lib/*/libutil.so.1       /lib/
 COPY --from=lotus-builder /usr/lib/*/libltdl.so.7   /lib/
 COPY --from=lotus-builder /usr/lib/*/libnuma.so.1   /lib/
 COPY --from=lotus-builder /usr/lib/*/libhwloc.so.5  /lib/
 COPY --from=lotus-builder /usr/lib/*/libOpenCL.so.1 /lib/
 RUN useradd -r -u 532 -U fc \
 && mkdir -p /etc/OpenCL/vendors \
 && echo "libnvidia-opencl.so.1" > /etc/OpenCL/vendors/nvidia.icd
 #####################################
 FROM lotus-base AS lotus
 MAINTAINER Lotus Development Team
 COPY --from=lotus-builder /opt/filecoin/lotus /usr/local/bin/
 COPY --from=lotus-builder /opt/filecoin/lotus-shed /usr/local/bin/
 #COPY scripts/docker-lotus-entrypoint.sh /
 #COPY myscripts/setup-node.sh /docker-entrypoint-scripts.d/setup-node.sh
 ARG DOCKER_LOTUS_IMPORT_SNAPSHOT https://snapshots.mainnet.filops.net/minimal/latest
 ENV DOCKER_LOTUS_IMPORT_SNAPSHOT ${DOCKER_LOTUS_IMPORT_SNAPSHOT}
 ENV FILECOIN_PARAMETER_CACHE /var/tmp/filecoin-proof-parameters
 ENV LOTUS_PATH /var/lib/lotus
 ENV DOCKER_LOTUS_IMPORT_WALLET ""
 RUN mkdir /var/lib/lotus /var/tmp/filecoin-proof-parameters
 RUN chown fc: /var/lib/lotus /var/tmp/filecoin-proof-parameters
 VOLUME /var/lib/lotus
 VOLUME /var/tmp/filecoin-proof-parameters
 USER fc
 EXPOSE 1234
 ENTRYPOINT ["/docker-lotus-entrypoint.sh"]
 CMD ["-help"]
 #####################################
 FROM lotus-base AS lotus-all-in-one
 ENV FILECOIN_PARAMETER_CACHE /var/tmp/filecoin-proof-parameters
 ENV LOTUS_MINER_PATH /var/lib/lotus-miner
 ENV LOTUS_PATH /var/lib/lotus
 ENV LOTUS_WORKER_PATH /var/lib/lotus-worker
 ENV WALLET_PATH /var/lib/lotus-wallet
 COPY --from=lotus-builder /opt/filecoin/lotus          /usr/local/bin/
 COPY --from=lotus-builder /opt/filecoin/lotus-seed     /usr/local/bin/
 COPY --from=lotus-builder /opt/filecoin/lotus-shed     /usr/local/bin/
 #COPY --from=lotus-builder /opt/filecoin/lotus-wallet   /usr/local/bin/
 #COPY --from=lotus-builder /opt/filecoin/lotus-gateway  /usr/local/bin/
 COPY --from=lotus-builder /opt/filecoin/lotus-miner    /usr/local/bin/
 COPY --from=lotus-builder /opt/filecoin/lotus-worker   /usr/local/bin/
 #COPY --from=lotus-builder /opt/filecoin/lotus-stats    /usr/local/bin/
 #COPY --from=lotus-builder /opt/filecoin/lotus-fountain /usr/local/bin/
 RUN mkdir /var/tmp/filecoin-proof-parameters
 RUN mkdir /var/lib/lotus
 RUN mkdir /var/lib/lotus-miner
 RUN mkdir /var/lib/lotus-worker
 RUN mkdir /var/lib/lotus-wallet
 RUN chown fc: /var/tmp/filecoin-proof-parameters
 RUN chown fc: /var/lib/lotus
 RUN chown fc: /var/lib/lotus-miner
 RUN chown fc: /var/lib/lotus-worker
 RUN chown fc: /var/lib/lotus-wallet
 #VOLUME /var/tmp/filecoin-proof-parameters
 #VOLUME /var/lib/lotus
 #VOLUME /var/lib/lotus-miner
 #VOLUME /var/lib/lotus-worker
 #VOLUME /var/lib/lotus-wallet
 EXPOSE 1234
 EXPOSE 2345
 EXPOSE 3456
 EXPOSE 1777
@@ -1,12 +0,0 @@
 #!/usr/bin/env bash
 # Build cerc/lotus
 source ${CERC_CONTAINER_BASE_DIR}/build-base.sh
 SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 # Per lotus docs, 'releases' branch always contains latest stable release
 git -C ${CERC_REPO_BASE_DIR}/lotus checkout releases
 # Replace repo's Dockerfile with modified one
 cp ${SCRIPT_DIR}/Dockerfile ${CERC_REPO_BASE_DIR}/lotus/Dockerfile
 docker build -t cerc/lotus:local ${build_command_args} ${CERC_REPO_BASE_DIR}/lotus
@@ -1,14 +1,11 @@
-#!/usr/bin/env bash
+#!/bin/sh
-set -e
+
 if [ -n "$CERC_SCRIPT_DEBUG" ]; then
  set -x
 fi
 # Test if the container's filesystem is old (run previously) or new
 EXISTSFILENAME=/var/exists
 echo "Test container starting"
 if [[ -f "$EXISTSFILENAME" ]];
 then
-    TIMESTAMP=`cat $EXISTSFILENAME`
+    TIMESTAMP = `cat $EXISTSFILENAME`
    echo "Filesystem is old, created: $TIMESTAMP" 
 else
    echo "Filesystem is fresh"
@@ -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,6 +38,3 @@ cerc/optimism-op-node
 cerc/optimism-op-proposer
 cerc/pocket
 cerc/watcher-azimuth
 cerc/ipld-eth-state-snapshot
 cerc/watcher-gelato
 cerc/lotus
@@ -26,5 +26,3 @@ foundry
 fixturenet-optimism
 fixturenet-pocket
 watcher-azimuth
 watcher-gelato
 fixturenet-lotus
@@ -1,36 +1,32 @@
-github.com/cerc-io/ipld-eth-db
+cerc-io/ipld-eth-db
-github.com/cerc-io/go-ethereum
+cerc-io/go-ethereum
-github.com/cerc-io/ipld-eth-server
+cerc-io/ipld-eth-server
-github.com/cerc-io/eth-statediff-service
+cerc-io/eth-statediff-service
-github.com/cerc-io/eth-statediff-fill-service
+cerc-io/eth-statediff-fill-service
-github.com/cerc-io/ipld-eth-db-validator
+cerc-io/ipld-eth-db-validator
-github.com/cerc-io/ipld-eth-beacon-indexer
+cerc-io/ipld-eth-beacon-indexer
-github.com/cerc-io/ipld-eth-beacon-db
+cerc-io/ipld-eth-beacon-db
-github.com/cerc-io/laconicd
+cerc-io/laconicd
-github.com/cerc-io/laconic-sdk
+cerc-io/laconic-sdk
-github.com/cerc-io/laconic-registry-cli
+cerc-io/laconic-registry-cli
-github.com/cerc-io/laconic-console
+cerc-io/laconic-console
-github.com/cerc-io/mobymask-watcher
+cerc-io/mobymask-watcher
-github.com/cerc-io/watcher-ts
+cerc-io/watcher-ts
-github.com/cerc-io/mobymask-v2-watcher-ts
+cerc-io/mobymask-v2-watcher-ts
-github.com/cerc-io/MobyMask
+cerc-io/MobyMask
-github.com/vulcanize/uniswap-watcher-ts
+vulcanize/uniswap-watcher-ts
-github.com/vulcanize/uniswap-v3-info
+vulcanize/uniswap-v3-info
-github.com/vulcanize/assemblyscript
+vulcanize/assemblyscript
-github.com/cerc-io/eth-probe
+cerc-io/eth-probe
-github.com/cerc-io/tx-spammer
+cerc-io/tx-spammer
-github.com/dboreham/foundry
+dboreham/foundry
-github.com/lirewine/gem
+lirewine/gem
-github.com/lirewine/debug
+lirewine/debug
-github.com/lirewine/crypto
+lirewine/crypto
-github.com/lirewine/sdk
+lirewine/sdk
-github.com/telackey/act_runner
+telackey/act_runner
-github.com/ethereum-optimism/op-geth
+ethereum-optimism/op-geth
-github.com/ethereum-optimism/optimism
+ethereum-optimism/optimism
-github.com/pokt-network/pocket-core
+pokt-network/pocket-core
-github.com/pokt-network/pocket-core-deployments
+pokt-network/pocket-core-deployments
-github.com/cerc-io/azimuth-watcher-ts
+cerc-io/azimuth-watcher-ts
 github.com/cerc-io/ipld-eth-state-snapshot
 github.com/cerc-io/gelato-watcher-ts
 github.com/filecoin-project/lotus
 git.vdb.to/cerc-io/test-project
@@ -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
@@ -1,7 +1,7 @@
 version: "1.0"
 name: azimuth
 repos:
-  - github.com/cerc-io/azimuth-watcher-ts
+  - cerc-io/azimuth-watcher-ts
 containers:
  - cerc/watcher-azimuth
 pods:
@@ -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:
  - github.com/cerc-io/ipld-eth-state-snapshot@v5
  - github.com/cerc-io/eth-statediff-service@v5
  - github.com/cerc-io/ipld-eth-db@v5
  - github.com/cerc-io/ipld-eth-server@v5
 containers:
  - cerc/ipld-eth-state-snapshot
  - cerc/eth-statediff-service
  - cerc/ipld-eth-db
  - cerc/ipld-eth-server
@@ -1,11 +1,11 @@
 version: "1.0"
 name: erc20-watcher
 repos:
-  - github.com/cerc-io/go-ethereum
+  - cerc-io/go-ethereum
-  - github.com/cerc-io/ipld-eth-db
+  - cerc-io/ipld-eth-db
-  - github.com/cerc-io/ipld-eth-server
+  - cerc-io/ipld-eth-server
-  - github.com/cerc-io/watcher-ts
+  - cerc-io/watcher-ts
-  - github.com/dboreham/foundry
+  - dboreham/foundry
 containers:
  - cerc/foundry
  - cerc/go-ethereum
@@ -1,10 +1,10 @@
 version: "1.0"
 name: erc721-watcher
 repos:
-  - github.com/cerc-io/go-ethereum
+  - cerc-io/go-ethereum
-  - github.com/cerc-io/ipld-eth-db
+  - cerc-io/ipld-eth-db
-  - github.com/cerc-io/ipld-eth-server
+  - cerc-io/ipld-eth-server
-  - github.com/cerc-io/watcher-ts
+  - cerc-io/watcher-ts
 containers:
  - cerc/go-ethereum
  - cerc/go-ethereum-foundry
@@ -2,15 +2,13 @@ version: "1.0"
 name: fixturenet-eth-loaded
 decription: "Loaded Ethereum Fixturenet"
 repos:
-  - github.com/cerc-io/go-ethereum
+  - cerc-io/go-ethereum
-  - github.com/cerc-io/tx-spammer
+  - cerc-io/tx-spammer
-  - github.com/cerc-io/ipld-eth-server
+  - cerc-io/ipld-eth-server
-  - github.com/cerc-io/ipld-eth-db
+  - cerc-io/ipld-eth-db
  - github.com/cerc-io/lighthouse
 containers:
  - cerc/go-ethereum
 containers:
  - cerc/lighthouse
  - cerc/lighthouse-cli
  - cerc/fixturenet-eth-geth
  - cerc/fixturenet-eth-lighthouse
  - cerc/ipld-eth-server
@@ -2,14 +2,12 @@ version: "1.2"
 name: fixturenet-eth-tx
 decription: "Ethereum Fixturenet w/ tx-spammer"
 repos:
-  - github.com/cerc-io/go-ethereum
+  - cerc-io/go-ethereum
-  - github.com/cerc-io/tx-spammer
+  - cerc-io/tx-spammer
-  - github.com/dboreham/foundry
+  - dboreham/foundry
  - github.com/cerc-io/lighthouse
 containers:
  - cerc/go-ethereum
  - cerc/lighthouse
  - cerc/lighthouse-cli
  - cerc/fixturenet-eth-geth
  - cerc/fixturenet-eth-lighthouse
  - cerc/tx-spammer
@@ -1,6 +1,6 @@
 # fixturenet-eth
-Instructions for deploying a local a geth + lighthouse blockchain "fixturenet" for development and testing purposes using laconic-stack-orchestrator (the installation of which is covered [here](https://github.com/cerc-io/stack-orchestrator)):
+Instructions for deploying a local a geth + lighthouse blockchain "fixturenet" for development and testing purposes using laconic-stack-orchestrator (the installation of which is covered [here](https://github.com/cerc-io/stack-orchestrator#user-mode)):
 ## Clone required repositories
@@ -66,7 +66,7 @@ It is not necessary to use them all at once, but a complete example follows:
 ```
 # Setup
-$ laconic-so setup-repositories --include github.com/cerc-io/go-ethereum,github.com/cerc-io/ipld-eth-db,github.com/cerc-io/ipld-eth-server,github.com/cerc-io/ipld-eth-beacon-db,github.com/cerc-io/ipld-eth-beacon-indexer,github.com/cerc-io/eth-probe,github.com/cerc-io/tx-spammer
+$ laconic-so setup-repositories --include cerc-io/go-ethereum,cerc-io/ipld-eth-db,cerc-io/ipld-eth-server,cerc-io/ipld-eth-beacon-db,cerc-io/ipld-eth-beacon-indexer,cerc-io/eth-probe,cerc-io/tx-spammer
 # Build
 $ laconic-so build-containers --include cerc/go-ethereum,cerc/lighthouse,cerc/fixturenet-eth-geth,cerc/fixturenet-eth-lighthouse,cerc/ipld-eth-db,cerc/ipld-eth-server,cerc/ipld-eth-beacon-db,cerc/ipld-eth-beacon-indexer,cerc/eth-probe,cerc/keycloak,cerc/tx-spammer
@@ -2,13 +2,11 @@ version: "1.1"
 name: fixturenet-eth
 decription: "Ethereum Fixturenet"
 repos:
-  - github.com/cerc-io/go-ethereum
+  - cerc-io/go-ethereum
-  - github.com/cerc-io/lighthouse
+  - dboreham/foundry
  - github.com/dboreham/foundry
 containers:
  - cerc/go-ethereum
  - cerc/lighthouse
  - cerc/lighthouse-cli
  - cerc/fixturenet-eth-geth
  - cerc/fixturenet-eth-lighthouse
  - cerc/foundry
@@ -2,14 +2,14 @@ version: "1.1"
 name: fixturenet-laconic-loaded
 description: "A full featured laconic fixturenet"
 repos:
-  - github.com/cerc-io/laconicd
+  - cerc-io/laconicd
-  - github.com/lirewine/debug
+  - lirewine/debug
-  - github.com/lirewine/crypto
+  - lirewine/crypto
-  - github.com/lirewine/gem
+  - lirewine/gem
-  - github.com/lirewine/sdk
+  - lirewine/sdk
-  - github.com/cerc-io/laconic-sdk
+  - cerc-io/laconic-sdk
-  - github.com/cerc-io/laconic-registry-cli
+  - cerc-io/laconic-registry-cli
-  - github.com/cerc-io/laconic-console
+  - cerc-io/laconic-console
 npms:
  - laconic-sdk
  - laconic-registry-cli
@@ -2,9 +2,9 @@ version: "1.0"
 name: fixturenet-laconicd
 description: "A laconicd fixturenet"
 repos:
-  - github.com/cerc-io/laconicd
+  - cerc-io/laconicd
-  - github.com/cerc-io/laconic-sdk
+  - cerc-io/laconic-sdk
-  - github.com/cerc-io/laconic-registry-cli
+  - cerc-io/laconic-registry-cli
 npms:
  - laconic-sdk
  - laconic-registry-cli
@@ -1,28 +0,0 @@
 # Lotus Fixturenet
 Instructions for deploying a local Lotus (Filecoin) chain for development and testing purposes using laconic-stack-orchestrator.
 ## 1. Clone required repositories
 ```
 $ laconic-so --stack fixturenet-lotus setup-repositories
 ```
 ## 2. Build the stack's packages and containers
 ```
 $ laconic-so --stack fixturenet-lotus build-containers
 ```
 ## 3. Deploy the stack
 ```
 $ laconic-so --stack fixturenet-lotus deploy up
 ```
 Correct operation should be verified by checking the container logs with:
 ```
 $ laconic-so --stack fixturenet-lotus deploy logs lotus-miner
 $ laconic-so --stack fixturenet-lotus deploy logs lotus-node-1
 $ laconic-so --stack fixturenet-lotus deploy logs lotus-node-2
 ```
 or by checking the chain status on each node:
 ```
 $ laconic-so --stack fixturenet-lotus deploy exec lotus-miner "lotus status"
 $ laconic-so --stack fixturenet-lotus deploy exec lotus-node-1 "lotus status"
 $ laconic-so --stack fixturenet-lotus deploy exec lotus-node-2 "lotus status"
 ```
@@ -1,9 +0,0 @@
 version: "1.0"
 name: fixturenet-lotus
 description: "A lotus fixturenet"
 repos:
  - github.com/filecoin-project/lotus
 containers:
  - cerc/lotus
 pods:
  - fixturenet-lotus
@@ -9,7 +9,7 @@ Prerequisite: An L1 Ethereum RPC endpoint
 Clone required repositories:
 ```bash
-laconic-so --stack fixturenet-optimism setup-repositories --exclude github.com/cerc-io/go-ethereum
+laconic-so --stack fixturenet-optimism setup-repositories --exclude cerc-io/go-ethereum
 # 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
 ```
@@ -2,10 +2,10 @@ version: "1.0"
 name: fixturenet-optimism
 decription: "Optimism Fixturenet"
 repos:
-  - github.com/cerc-io/go-ethereum
+  - cerc-io/go-ethereum
-  - github.com/dboreham/foundry
+  - dboreham/foundry
-  - github.com/ethereum-optimism/optimism
+  - ethereum-optimism/optimism
-  - github.com/ethereum-optimism/op-geth
+  - ethereum-optimism/op-geth
 containers:
  - cerc/go-ethereum
  - cerc/lighthouse
@@ -1,19 +0,0 @@
 # fixturenet-plugeth-tx
 A variation of `fixturenet-eth` that uses `plugeth` instead of `go-ethereum`.
 See `stacks/fixturenet-eth/README.md` for more information.
 ## Containers
 * cerc/lighthouse
 * cerc/fixturenet-eth-plugeth
 * cerc/fixturenet-eth-lighthouse
 * cerc/tx-spammer
 ## Deploy the stack
 ```
 $ laconic-so --stack fixturenet-plugeth-tx setup-repositories
 $ laconic-so --stack fixturenet-plugeth-tx build-containers
 $ laconic-so --stack fixturenet-plugeth-tx deploy up
 ```
@@ -1,18 +0,0 @@
 version: "1.2"
 name: fixturenet-plugeth-tx
 decription: "plugeth Ethereum Fixturenet w/ tx-spammer"
 repos:
  - github.com/cerc-io/tx-spammer
  - github.com/dboreham/foundry
  - github.com/cerc-io/lighthouse
 containers:
  - cerc/lighthouse
  - cerc/lighthouse-cli
  - cerc/fixturenet-plugeth-plugeth
  - cerc/fixturenet-plugeth-lighthouse
  - cerc/tx-spammer
  - cerc/foundry
 pods:
  - fixturenet-plugeth
  - foundry
  - tx-spammer
@@ -1,41 +1,41 @@
 # Pocket Fixturenet
-Instructions for deploying a local single-node Pocket chain alongside a geth + lighthouse blockchain "fixturenet" for development and testing purposes using Stack Orchestrator.
+Instructions for deploying a local single-node Pocket chain alongside a geth + lighthouse blockchain "fixturenet" for development and testing purposes using laconic-stack-orchestrator.
-## 1. Clone required repositories
+## 1. Build Laconic Stack Orchestrator
 Build this fork of Laconic Stack Orchestrator which includes the fixturenet-pocket stack:
 ```
 $ scripts/build_shiv_package.sh
 $ cd package
 $ mv laconic-so-{version} /usr/local/bin/laconic-so  # Or move laconic-so to ~/bin or your favorite on-path directory
 ```
 ## 2. Clone required repositories
 ```
 $ laconic-so --stack fixturenet-pocket setup-repositories
 ```
-## 2. Build the stack's containers
+## 3. Build the stack's containers
 ```
 $ laconic-so --stack fixturenet-pocket build-containers
 ```
-## 3. Deploy the stack
+## 4. Deploy the stack
 ```
 $ laconic-so --stack fixturenet-pocket deploy up
 ```
 It may take up to 10 minutes for the Eth Fixturenet to fully come online and start producing blocks.
-
+## 5. Check status
 ## 4. Check status
 **Eth Fixturenet:**
 ```
 $ laconic-so --stack fixturenet-pocket deploy exec fixturenet-eth-bootnode-lighthouse /scripts/status-internal.sh
 ```
 Response:
 ```
 Waiting for geth to generate DAG.... done
 Waiting for beacon phase0.... done
 Waiting for beacon altair.... done
 Waiting for beacon bellatrix pre-merge.... done
 Waiting for beacon bellatrix merge.... done
 ```
 **Pocket node:**
 ```
 $ laconic-so --stack fixturenet-pocket deploy exec pocket "pocket query height"
 ```
 Response:
 ```
 2023/04/20 08:07:46 Initializing Pocket Datadir
 2023/04/20 08:07:46 datadir = /home/app/.pocket
 http://localhost:8081/v1/query/height
@@ -43,18 +43,17 @@ http://localhost:8081/v1/query/height
    "height": 4
 }
 ```
-or see the full logs:
+or
 ```
 $ laconic-so --stack fixturenet-pocket deploy logs pocket
 ```
-## 5. Send a relay request to Pocket node
+## 6. Send a relay request to Pocket node
 The Pocket node serves relay requests at `http://localhost:8081/v1/client/sim`  
-
+**Example request:**
 Example request:
 ```
 $ curl -X POST --data '{"relay_network_id":"0021","payload":{"data":"{\"jsonrpc\": \"2.0\",\"id\": 1,\"method\": \"eth_blockNumber\",\"params\": []}","method":"POST","path":"","headers":{}}}' http://localhost:8081/v1/client/sim
 ```
-Response:
+**Response:**
 ```
 "{\"jsonrpc\":\"2.0\",\"id\":1,\"result\":\"0x6fe\"}\n"
 ```
@@ -2,14 +2,12 @@ version: "1.0"
 name: fixturenet-pocket
 description: "A single node pocket chain that can serve relays from the geth-1 node in eth-fixturenet"
 repos:
-  - github.com/cerc-io/go-ethereum
+  - cerc-io/go-ethereum
-  - github/com/cerc-io/lighthouse
+  - pokt-network/pocket-core
-  - github.com/pokt-network/pocket-core
+  - pokt-network/pocket-core-deployments # contains the dockerfile
  - github.com/pokt-network/pocket-core-deployments # contains the dockerfile
 containers:
  - cerc/go-ethereum
  - cerc/lighthouse
  - cerc/lighthouse-cli
  - cerc/fixturenet-eth-geth
  - cerc/fixturenet-eth-lighthouse
  - cerc/pocket
@@ -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:
  - github.com/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.
@@ -9,7 +9,7 @@ Prerequisite: L2 Optimism Geth and Node RPC endpoints
 Clone required repositories:
 ```bash
-laconic-so --stack mobymask-v2 setup-repositories --include github.com/cerc-io/MobyMask,github.com/cerc-io/watcher-ts,github.com/cerc-io/mobymask-v2-watcher-ts
+laconic-so --stack mobymask-v2 setup-repositories --include cerc-io/MobyMask,cerc-io/watcher-ts,cerc-io/mobymask-v2-watcher-ts
 # 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
 ```
@@ -1,13 +1,13 @@
 version: "1.0"
 name: mobymask-v2
 repos:
-  - github.com/cerc-io/go-ethereum
+  - cerc-io/go-ethereum
-  - github.com/dboreham/foundry
+  - dboreham/foundry
-  - github.com/ethereum-optimism/optimism
+  - ethereum-optimism/optimism
-  - github.com/ethereum-optimism/op-geth
+  - ethereum-optimism/op-geth
-  - github.com/cerc-io/watcher-ts
+  - cerc-io/watcher-ts
-  - github.com/cerc-io/mobymask-v2-watcher-ts
+  - cerc-io/mobymask-v2-watcher-ts
-  - github.com/cerc-io/MobyMask
+  - cerc-io/MobyMask
 containers:
  - cerc/go-ethereum
  - cerc/lighthouse
@@ -14,7 +14,7 @@ This demo has been tested on a `Ubuntu 22.04 LTS` machine with `8GB` of RAM
 Clone required repositories:
  ```bash
-  laconic-so --stack mobymask-v2 setup-repositories --include github.com/cerc-io/MobyMask,github.com/cerc-io/watcher-ts,github.com/cerc-io/mobymask-v2-watcher-ts
+  laconic-so --stack mobymask-v2 setup-repositories --include cerc-io/MobyMask,cerc-io/watcher-ts,cerc-io/mobymask-v2-watcher-ts
  # This will clone the required repositories at ~/cerc
  # If this throws an error as a result of being already checked out to a branch/tag in a repo, remove the repositories mentioned in the next step and re-run the command
@@ -11,7 +11,7 @@ This deployment expects that ipld-eth-server's endpoints are available on the lo
 ## Clone required repositories
 ```
-$ laconic-so setup-repositories --include github.com/cerc-io/watcher-ts
+$ laconic-so setup-repositories --include cerc-io/watcher-ts
 ```
 ## Build the watcher container
@@ -1,7 +1,7 @@
 version: "1.0"
 name: mobymask-watcher
 repos:
-  - github.com/cerc-io/watcher-ts/v0.2.19
+  - cerc-io/watcher-ts/v0.2.19
 containers:
  - cerc/watcher-mobymask
 pods:
@@ -2,8 +2,8 @@ version: "1.1"
 name: package-registry
 decription: "Local Package Registry"
 repos:
-  - github.com/cerc-io/hosting
+  - cerc-io/hosting
-  - gitea.com/gitea/act_runner
+  - telackey/act_runner
 containers:
  - cerc/act-runner
  - cerc/act-runner-task-executor
@@ -2,8 +2,7 @@ version: "1.0"
 name: test
 description: "A test stack"
 repos:
-  - github.com/cerc-io/laconicd
+  - cerc-io/laconicd
  - git.vdb.to/cerc-io/test-project@test-branch
 containers:
  - cerc/test-container
 pods:
@@ -1,8 +1,8 @@
 version: "1.0"
 name: uniswap-v3
 repos:
-  - github.com/vulcanize/uniswap-watcher-ts
+  - vulcanize/uniswap-watcher-ts
-  - github.com/vulcanize/uniswap-v3-info
+  - vulcanize/uniswap-v3-info
 containers:
  - cerc/watcher-uniswap-v3
  - cerc/uniswap-v3-info
@@ -28,146 +28,108 @@ import importlib.resources
 from pathlib import Path
 from .util import include_exclude_check, get_parsed_stack_config
 class DeployCommandContext(object):
    def __init__(self, cluster_context, docker):
        self.cluster_context = cluster_context
        self.docker = docker
-
+@click.command()
@click.group()
@click.option("--include", help="only start these components")
@click.option("--exclude", help="don\'t start these components")
@click.option("--env-file", help="env file to be used")
@click.option("--cluster", help="specify a non-default cluster name")
@click.argument('command', required=True)  # help: command: up|down|ps
@click.argument('extra_args', nargs=-1)  # help: command: up|down|ps <service1> <service2>
@click.pass_context
-def command(ctx, include, exclude, env_file, cluster):
+def command(ctx, include, exclude, env_file, cluster, command, extra_args):
    '''deploy a stack'''
-    cluster_context = _make_cluster_context(ctx.obj, include, exclude, cluster, env_file)
+    # TODO: implement option exclusion and command value constraint lost with the move from argparse to click
    debug = ctx.obj.debug
    quiet = ctx.obj.quiet
    verbose = ctx.obj.verbose
    local_stack = ctx.obj.local_stack
    dry_run = ctx.obj.dry_run
    stack = ctx.obj.stack
    cluster_context = _make_cluster_context(ctx.obj, include, exclude, cluster)
    # See: https://gabrieldemarmiesse.github.io/python-on-whales/sub-commands/compose/
-    docker = DockerClient(compose_files=cluster_context.compose_files, compose_project_name=cluster_context.cluster,
+    docker = DockerClient(compose_files=cluster_context.compose_files, compose_project_name=cluster_context.cluster, compose_env_file=env_file)
                          compose_env_file=cluster_context.env_file)
    ctx.obj = DeployCommandContext(cluster_context, docker)
    # Subcommand is executed now, by the magic of click
@command.command()
@click.argument('extra_args', nargs=-1)  # help: command: up <service1> <service2>
@click.pass_context
 def up(ctx, extra_args):
    global_context = ctx.parent.parent.obj
    extra_args_list = list(extra_args) or None
    if not global_context.dry_run:
        cluster_context = ctx.obj.cluster_context
        container_exec_env = _make_runtime_env(global_context)
        for attr, value in container_exec_env.items():
            os.environ[attr] = value
        if global_context.verbose:
            print(f"Running compose up with container_exec_env: {container_exec_env}, extra_args: {extra_args_list}")
        for pre_start_command in cluster_context.pre_start_commands:
            _run_command(global_context, cluster_context.cluster, pre_start_command)
        ctx.obj.docker.compose.up(detach=True, services=extra_args_list)
        for post_start_command in cluster_context.post_start_commands:
            _run_command(global_context, cluster_context.cluster, post_start_command)
        _orchestrate_cluster_config(global_context, cluster_context.config, ctx.obj.docker, container_exec_env)
    if not dry_run:
        if command == "up":
            container_exec_env = _make_runtime_env(ctx.obj)
            for attr, value in container_exec_env.items():
                os.environ[attr] = value
            if verbose:
                print(f"Running compose up with container_exec_env: {container_exec_env}, extra_args: {extra_args_list}")
            for pre_start_command in cluster_context.pre_start_commands:
                _run_command(ctx.obj, cluster_context.cluster, pre_start_command)
            docker.compose.up(detach=True, services=extra_args_list)
            for post_start_command in cluster_context.post_start_commands:
                _run_command(ctx.obj, cluster_context.cluster, post_start_command)
-@command.command()
+            _orchestrate_cluster_config(ctx.obj, cluster_context.config, docker, container_exec_env)
@click.option("--delete-volumes/--preserve-volumes", default=False, help="delete data volumes")
@click.argument('extra_args', nargs=-1)  # help: command: down<service1> <service2>
@click.pass_context
 def down(ctx, delete_volumes, extra_args):
    global_context = ctx.parent.parent.obj
    extra_args_list = list(extra_args) or None
    if not global_context.dry_run:
        if global_context.verbose:
            print("Running compose down")
        timeout_arg = None
        if extra_args_list:
            timeout_arg = extra_args_list[0]
        # Specify shutdown timeout (default 10s) to give services enough time to shutdown gracefully
        ctx.obj.docker.compose.down(timeout=timeout_arg, volumes=delete_volumes)
        elif command == "down":
            if verbose:
                print("Running compose down")
-@command.command()
+            timeout_arg = None
-@click.pass_context
+            if extra_args_list:
-def ps(ctx):
+                timeout_arg=extra_args_list[0]
    global_context = ctx.parent.parent.obj
    if not global_context.dry_run:
        if global_context.verbose:
            print("Running compose ps")
        container_list = ctx.obj.docker.compose.ps()
        if len(container_list) > 0:
            print("Running containers:")
            for container in container_list:
                print(f"id: {container.id}, name: {container.name}, ports: ", end="")
                ports = container.network_settings.ports
                comma = ""
                for port_mapping in ports.keys():
                    mapping = ports[port_mapping]
                    print(comma, end="")
                    if mapping is None:
                        print(f"{port_mapping}", end="")
                    else:
                        print(f"{mapping[0]['HostIp']}:{mapping[0]['HostPort']}->{port_mapping}", end="")
                    comma = ", "
                print()
        else:
            print("No containers running")
-
+            # Specify shutdown timeout (default 10s) to give services enough time to shutdown gracefully
-@command.command()
+            docker.compose.down(timeout=timeout_arg)
-@click.argument('extra_args', nargs=-1)  # help: command: port <service1> <service2>
+        elif command == "exec":
-@click.pass_context
+            if extra_args_list is None or len(extra_args_list) < 2:
-def port(ctx, extra_args):
+                print("Usage: exec <service> <cmd>")
-    global_context = ctx.parent.parent.obj
+                sys.exit(1)
-    extra_args_list = list(extra_args) or None
+            service_name = extra_args_list[0]
-    if not global_context.dry_run:
+            command_to_exec = ["sh", "-c"] + extra_args_list[1:]
-        if extra_args_list is None or len(extra_args_list) < 2:
+            container_exec_env = _make_runtime_env(ctx.obj)
-            print("Usage: port <service> <exposed-port>")
+            if verbose:
-            sys.exit(1)
+                print(f"Running compose exec {service_name} {command_to_exec}")
-        service_name = extra_args_list[0]
+            try:
-        exposed_port = extra_args_list[1]
+                docker.compose.execute(service_name, command_to_exec, envs=container_exec_env)
-        if global_context.verbose:
+            except DockerException as error:
-            print(f"Running compose port {service_name} {exposed_port}")
+                print(f"container command returned error exit status")
-        mapped_port_data = ctx.obj.docker.compose.port(service_name, exposed_port)
+        elif command == "port":
-        print(f"{mapped_port_data[0]}:{mapped_port_data[1]}")
+            if extra_args_list is None or len(extra_args_list) < 2:
-
+                print("Usage: port <service> <exposed-port>")
-
+                sys.exit(1)
-@command.command()
+            service_name = extra_args_list[0]
-@click.argument('extra_args', nargs=-1)  # help: command: exec <service> <command>
+            exposed_port = extra_args_list[1]
-@click.pass_context
+            if verbose:
-def exec(ctx, extra_args):
+                print(f"Running compose port {service_name} {exposed_port}")
-    global_context = ctx.parent.parent.obj
+            mapped_port_data = docker.compose.port(service_name, exposed_port)
-    extra_args_list = list(extra_args) or None
+            print(f"{mapped_port_data[0]}:{mapped_port_data[1]}")
-    if not global_context.dry_run:
+        elif command == "ps":
-        if extra_args_list is None or len(extra_args_list) < 2:
+            if verbose:
-            print("Usage: exec <service> <cmd>")
+                print("Running compose ps")
-            sys.exit(1)
+            container_list = docker.compose.ps()
-        service_name = extra_args_list[0]
+            if len(container_list) > 0:
-        command_to_exec = ["sh", "-c"] + extra_args_list[1:]
+                print("Running containers:")
-        container_exec_env = _make_runtime_env(global_context)
+                for container in container_list:
-        if global_context.verbose:
+                    print(f"id: {container.id}, name: {container.name}, ports: ", end="")
-            print(f"Running compose exec {service_name} {command_to_exec}")
+                    ports = container.network_settings.ports
-        try:
+                    comma = ""
-            ctx.obj.docker.compose.execute(service_name, command_to_exec, envs=container_exec_env)
+                    for port_mapping in ports.keys():
-        except DockerException as error:
+                        mapping = ports[port_mapping]
-            print(f"container command returned error exit status")
+                        print(comma, end="")
-
+                        if mapping is None:
-
+                            print(f"{port_mapping}", end="")
-@command.command()
+                        else:
-@click.argument('extra_args', nargs=-1)  # help: command: logs <service1> <service2>
+                            print(f"{mapping[0]['HostIp']}:{mapping[0]['HostPort']}->{port_mapping}", end="")
-@click.pass_context
+                        comma = ", "
-def logs(ctx, extra_args):
+                    print()
-    global_context = ctx.parent.parent.obj
+            else:
-    extra_args_list = list(extra_args) or None
+                print("No containers running")
-    if not global_context.dry_run:
+        elif command == "logs":
-        if global_context.verbose:
+            if verbose:
-            print("Running compose logs")
+                print("Running compose logs")
-        logs_output = ctx.obj.docker.compose.logs(services=extra_args_list if extra_args_list is not None else [])
+            logs_output = docker.compose.logs(services=extra_args_list if extra_args_list is not None else [])
-        print(logs_output)
+            print(logs_output)
 def get_stack_status(ctx, stack):
@@ -175,7 +137,7 @@ def get_stack_status(ctx, stack):
    ctx_copy = copy.copy(ctx)
    ctx_copy.stack = stack
-    cluster_context = _make_cluster_context(ctx_copy, None, None, None, None)
+    cluster_context = _make_cluster_context(ctx_copy, None, None, None)
    docker = DockerClient(compose_files=cluster_context.compose_files, compose_project_name=cluster_context.cluster)
    # TODO: refactor to avoid duplicating this code above
    if ctx.verbose:
@@ -200,7 +162,7 @@ def _make_runtime_env(ctx):
    return container_exec_env
-def _make_cluster_context(ctx, include, exclude, cluster, env_file):
+def _make_cluster_context(ctx, include, exclude, cluster):
    if ctx.local_stack:
        dev_root_path = os.getcwd()[0:os.getcwd().rindex("stack-orchestrator")]
@@ -273,17 +235,16 @@ def _make_cluster_context(ctx, include, exclude, cluster, env_file):
    if ctx.verbose:
        print(f"files: {compose_files}")
-    return cluster_context(cluster, compose_files, pre_start_commands, post_start_commands, cluster_config, env_file)
+    return cluster_context(cluster, compose_files, pre_start_commands, post_start_commands, cluster_config)
 class cluster_context:
-    def __init__(self, cluster, compose_files, pre_start_commands, post_start_commands, config, env_file) -> None:
+    def __init__(self, cluster, compose_files, pre_start_commands, post_start_commands, config) -> None:
        self.cluster = cluster
        self.compose_files = compose_files
        self.pre_start_commands = pre_start_commands
        self.post_start_commands = post_start_commands
        self.config = config
        self.env_file = env_file
 def _convert_to_new_format(old_pod_array):
@@ -52,111 +52,15 @@ def is_git_repo(path):
 #   )
 def branch_strip(s):
    return s.split('@')[0]
 def host_and_path_for_repo(fully_qualified_repo):
    repo_branch_split = fully_qualified_repo.split("@")
    repo_branch = repo_branch_split[-1] if len(repo_branch_split) > 1 else None
    repo_host_split = repo_branch_split[0].split("/")
    # Legacy unqualified repo means github
    if len(repo_host_split) == 2:
        return "github.com", "/".join(repo_host_split), repo_branch
    else:
        if len(repo_host_split) == 3:
            # First part is the host
            return repo_host_split[0], "/".join(repo_host_split[1:]), repo_branch
 # TODO: fix the messy arg list here
 def process_repo(verbose, quiet, dry_run, pull, check_only, git_ssh, dev_root_path, branches_array, fully_qualified_repo):
    repo_host, repo_path, repo_branch = host_and_path_for_repo(fully_qualified_repo)
    git_ssh_prefix = f"git@{repo_host}:"
    git_http_prefix = f"https://{repo_host}/"
    full_github_repo_path = f"{git_ssh_prefix if git_ssh else git_http_prefix}{repo_path}"
    repoName = repo_path.split("/")[-1]
    full_filesystem_repo_path = os.path.join(dev_root_path, repoName)
    is_present = os.path.isdir(full_filesystem_repo_path)
    current_repo_branch = git.Repo(full_filesystem_repo_path).active_branch.name if is_present else None
    if not quiet:
        present_text = f"already exists active branch: {current_repo_branch}" if is_present \
            else 'Needs to be fetched'
        print(f"Checking: {full_filesystem_repo_path}: {present_text}")
    # Quick check that it's actually a repo
    if is_present:
        if not is_git_repo(full_filesystem_repo_path):
            print(f"Error: {full_filesystem_repo_path} does not contain a valid git repository")
            sys.exit(1)
        else:
            if pull:
                if verbose:
                    print(f"Running git pull for {full_filesystem_repo_path}")
                if not check_only:
                    git_repo = git.Repo(full_filesystem_repo_path)
                    origin = git_repo.remotes.origin
                    origin.pull(progress=None if quiet else GitProgress())
                else:
                    print("(git pull skipped)")
    if not is_present:
        # Clone
        if verbose:
            print(f'Running git clone for {full_github_repo_path} into {full_filesystem_repo_path}')
        if not dry_run:
            git.Repo.clone_from(full_github_repo_path,
                                full_filesystem_repo_path,
                                progress=None if quiet else GitProgress())
        else:
            print("(git clone skipped)")
    # Checkout the requested branch, if one was specified
    branch_to_checkout = None
    if branches_array:
        # Find the current repo in the branches list
        print("Checking")
        for repo_branch in branches_array:
            repo_branch_tuple = repo_branch.split(" ")
            if repo_branch_tuple[0] == branch_strip(fully_qualified_repo):
                # checkout specified branch
                branch_to_checkout = repo_branch_tuple[1]
    else:
        branch_to_checkout = repo_branch
    if branch_to_checkout:
        if current_repo_branch is None or (current_repo_branch and (current_repo_branch != branch_to_checkout)):
            if not quiet:
                print(f"switching to branch {branch_to_checkout} in repo {repo_path}")
            git_repo = git.Repo(full_filesystem_repo_path)
            git_repo.git.checkout(branch_to_checkout)
        else:
            if verbose:
                print(f"repo {repo_path} is already switched to branch {branch_to_checkout}")
 def parse_branches(branches_string):
    if branches_string:
        result_array = []
        branches_directives = branches_string.split(",")
        for branch_directive in branches_directives:
            split_directive = branch_directive.split("@")
            if len(split_directive) != 2:
                print(f"Error: branch specified is not valid: {branch_directive}")
                sys.exit(1)
            result_array.append(f"{split_directive[0]} {split_directive[1]}")
        return result_array
    else:
        return None
@click.command()
@click.option("--include", help="only clone these repositories")
@click.option("--exclude", help="don\'t clone these repositories")
@click.option('--git-ssh', is_flag=True, default=False)
@click.option('--check-only', is_flag=True, default=False)
@click.option('--pull', is_flag=True, default=False)
@click.option("--branches", help="override branches for repositories")
@click.option('--branches-file', help="checkout branches specified in this file")
@click.pass_context
-def command(ctx, include, exclude, git_ssh, check_only, pull, branches, branches_file):
+def command(ctx, include, exclude, git_ssh, check_only, pull, branches_file):
    '''git clone the set of repositories required to build the complete system from source'''
    quiet = ctx.obj.quiet
@@ -164,29 +68,16 @@ def command(ctx, include, exclude, git_ssh, check_only, pull, branches, branches
    dry_run = ctx.obj.dry_run
    stack = ctx.obj.stack
-    branches_array = []
+    branches = []
    # TODO: branches file needs to be re-worked in the context of stacks
    if branches_file:
-        if branches:
+        if verbose:
-            print("Error: can't specify both --branches and --branches-file")
+            print(f"loading branches from: {branches_file}")
-            sys.exit(1)
+        with open(branches_file) as branches_file_open:
-        else:
+            branches = branches_file_open.read().splitlines()
-            if verbose:
+        if verbose:
-                print(f"loading branches from: {branches_file}")
+            print(f"Branches are: {branches}")
            with open(branches_file) as branches_file_open:
                branches_array = branches_file_open.read().splitlines()
    print(f"branches: {branches}")
    if branches:
        if branches_file:
            print("Error: can't specify both --branches and --branches-file")
            sys.exit(1)
        else:
            branches_array = parse_branches(branches)
    if branches_array and verbose:
        print(f"Branches are: {branches_array}")
    local_stack = ctx.obj.local_stack
@@ -228,15 +119,64 @@ def command(ctx, include, exclude, git_ssh, check_only, pull, branches, branches
    repos = []
    for repo in repos_in_scope:
-        if include_exclude_check(branch_strip(repo), include, exclude):
+        if include_exclude_check(repo, include, exclude):
            repos.append(repo)
        else:
            if verbose:
                print(f"Excluding: {repo}")
    def process_repo(repo):
        git_ssh_prefix = "git@github.com:"
        git_http_prefix = "https://github.com/"
        full_github_repo_path = f"{git_ssh_prefix if git_ssh else git_http_prefix}{repo}"
        repoName = repo.split("/")[-1]
        full_filesystem_repo_path = os.path.join(dev_root_path, repoName)
        is_present = os.path.isdir(full_filesystem_repo_path)
        if not quiet:
            present_text = f"already exists active branch: {git.Repo(full_filesystem_repo_path).active_branch}" if is_present \
                else 'Needs to be fetched'
            print(f"Checking: {full_filesystem_repo_path}: {present_text}")
        # Quick check that it's actually a repo
        if is_present:
            if not is_git_repo(full_filesystem_repo_path):
                print(f"Error: {full_filesystem_repo_path} does not contain a valid git repository")
                sys.exit(1)
            else:
                if pull:
                    if verbose:
                        print(f"Running git pull for {full_filesystem_repo_path}")
                    if not check_only:
                        git_repo = git.Repo(full_filesystem_repo_path)
                        origin = git_repo.remotes.origin
                        origin.pull(progress=None if quiet else GitProgress())
                    else:
                        print("(git pull skipped)")
        if not is_present:
            # Clone
            if verbose:
                print(f'Running git clone for {full_github_repo_path} into {full_filesystem_repo_path}')
            if not dry_run:
                git.Repo.clone_from(full_github_repo_path,
                                    full_filesystem_repo_path,
                                    progress=None if quiet else GitProgress())
            else:
                print("(git clone skipped)")
        # Checkout the requested branch, if one was specified
        if branches:
            # Find the current repo in the branches list
            for repo_branch in branches:
                repo_branch_tuple = repo_branch.split(" ")
                if repo_branch_tuple[0] == repo:
                    # checkout specified branch
                    branch_to_checkout = repo_branch_tuple[1]
                    if verbose:
                        print(f"checking out branch {branch_to_checkout} in repo {repo}")
                        git_repo = git.Repo(full_filesystem_repo_path)
                        git_repo.git.checkout(branch_to_checkout)
    for repo in repos:
        try:
-            process_repo(verbose, quiet, dry_run, pull, check_only, git_ssh, dev_root_path, branches_array, repo)
+            process_repo(repo)
        except git.exc.GitCommandError as error:
            print(f"\n******* git command returned error exit status:\n{error}")
            sys.exit(1)
@@ -14,7 +14,6 @@
 # along with this program.  If not, see <http:#www.gnu.org/licenses/>.
 import click
 from dataclasses import dataclass
 from app import setup_repositories
 from app import build_containers
@@ -25,15 +24,17 @@ from app import version
 CONTEXT_SETTINGS = dict(help_option_names=['-h', '--help'])
-@dataclass
+# TODO: this seems kind of weird and heavy on boilerplate -- check it is
-class Options:
+# the best Python can do for us.
-    stack: str
+class Options(object):
-    quiet: bool = False
+    def __init__(self, stack, quiet, verbose, dry_run, local_stack, debug, continue_on_error):
-    verbose: bool = False
+        self.stack = stack
-    dry_run: bool = False
+        self.quiet = quiet
-    local_stack: bool = False
+        self.verbose = verbose
-    debug: bool = False
+        self.dry_run = dry_run
-    continue_on_error: bool = False
+        self.local_stack = local_stack
        self.debug = debug
        self.continue_on_error = continue_on_error
@click.group(context_settings=CONTEXT_SETTINGS)
--- a/Show More
+++ b/Show More
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
		`@@ -1 +0,0 @@`
			`}+V�{iνΆΠΉ�²�¨ΣΗ\k»qς␍—?δΪAΒfκ’~μ©™LΉ�tb·yqτ·²ηξΔ�Ο?ξaΣ�J`
		`@@ -1 +0,0 @@`
			`Βfκ’~μ©™LΉ�tb·yqτ·²ηξΔ�Ο?ξaΣ�J`
		`@@ -1 +0,0 @@`
			`7b2254797065223a22626c73222c22507269766174654b6579223a227446765352695367324733537367673050535979323358796a61494d5870736d64794732423755464c54343d227d`