ports etc

uniswap updates
2023-07-27 00:53:02 +00:00 · 2023-07-26 19:44:59 -04:00
100 changed files with 576 additions and 1350 deletions
@@ -21,7 +21,7 @@ services:
    cap_add:
      - SYS_PTRACE
    environment:
-      CERC_REMOTE_DEBUG: ${CERC_REMOTE_DEBUG:-true}
+      CERC_REMOTE_DEBUG: "true"
      CERC_RUN_STATEDIFF: ${CERC_RUN_STATEDIFF:-detect}
      CERC_STATEDIFF_DB_NODE_ID: 1
      CERC_SCRIPT_DEBUG: ${CERC_SCRIPT_DEBUG}
@@ -1,45 +0,0 @@
-services:
-  graph-node:
-    image: cerc/graph-node:local
-    environment:
-      ipfs: ipfs:5001
-      postgres_host: db
-      postgres_port: 5432
-      postgres_user: graph-node
-      postgres_pass: password
-      postgres_db: graph-node
-    ports:
-      - "8000"
-      - "8001"
-      - "8020"
-      - "8030"
-  ipfs:
-    image: ipfs/kubo:master-2023-02-20-714a968
-    volumes:
-      - ipfs-import:/import
-      - ipfs-data:/data/ipfs
-    ports:
-      - "8080"
-      - "4001"
-      - "5001"
-  db:
-    image: postgres:14-alpine
-    volumes:
-      - db-data:/var/lib/postgresql/data
-    environment:
-      POSTGRES_USER: "graph-node"
-      POSTGRES_DB: "graph-node"
-      POSTGRES_PASSWORD: "password"
-    healthcheck:
-      test: ["CMD", "nc", "-v", "localhost", "5432"]
-      interval: 30s
-      timeout: 10s
-      retries: 10
-      start_period: 3s
-    ports:
-      - "5432"
-
-volumes:
-  ipfs-import:
-  ipfs-data:
-  db-data:
@@ -8,9 +8,17 @@ services:
    image: cerc/lotus:local
    volumes:
      - ../config/fixturenet-lotus/setup-miner.sh:/docker-entrypoint-scripts.d/setup-miner.sh
-      - ../config/fixturenet-lotus/fund-account.sh:/fund-account.sh
-      - lotus_miner_params:/var/tmp/filecoin-proof-parameters
+      - ../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"
@@ -22,22 +30,14 @@ services:
    hostname: lotus-node-1
    env_file:
      - ../config/fixturenet-lotus/lotus-env.env
-    environment:
-      # Use 0.0.0.0 so that calls can be made from outside the container
-      - LOTUS_API_LISTENADDRESS=/ip4/0.0.0.0/tcp/1234/http
    image: cerc/lotus:local
    volumes:
      - ../config/fixturenet-lotus/setup-node.sh:/docker-entrypoint-scripts.d/setup-node.sh
-      - lotus_node_1_params:/var/tmp/filecoin-proof-parameters
+      - ../config/fixturenet-lotus/genesis/devgen.car:/devgen.car
      - lotus-shared:/root/.lotus-shared
-    healthcheck:
-      test: ["CMD", "nc", "-vz", "localhost", "1234"]
-      interval: 30s
-      timeout: 10s
-      retries: 10
-      start_period: 3s
    depends_on:
-      - lotus-miner
+      lotus-miner:
+        condition: service_healthy
    entrypoint: ["sh", "/docker-entrypoint-scripts.d/setup-node.sh"]
    ports:
      - "1234"
@@ -49,22 +49,14 @@ services:
    hostname: lotus-node-2
    env_file:
      - ../config/fixturenet-lotus/lotus-env.env
-    environment:
-      # Use 0.0.0.0 so that calls can be made from outside the container
-      - LOTUS_API_LISTENADDRESS=/ip4/0.0.0.0/tcp/1234/http
    image: cerc/lotus:local
    volumes:
      - ../config/fixturenet-lotus/setup-node.sh:/docker-entrypoint-scripts.d/setup-node.sh
-      - lotus_node_2_params:/var/tmp/filecoin-proof-parameters
+      - ../config/fixturenet-lotus/genesis/devgen.car:/devgen.car
      - lotus-shared:/root/.lotus-shared
-    healthcheck:
-      test: ["CMD", "nc", "-vz", "localhost", "1234"]
-      interval: 30s
-      timeout: 10s
-      retries: 10
-      start_period: 3s
    depends_on:
-      - lotus-miner
+      lotus-miner:
+        condition: service_healthy
    entrypoint: ["sh", "/docker-entrypoint-scripts.d/setup-node.sh"]
    ports:
      - "1234"
@@ -73,7 +65,4 @@ services:
      - "1777"

 volumes:
-  lotus_miner_params:
-  lotus_node_1_params:
-  lotus_node_2_params:
-  lotus-shared:
+  lotus-shared:
@@ -9,6 +9,7 @@ services:
    image: cerc/fixturenet-plugeth-plugeth:local
    volumes:
      - fixturenet_plugeth_bootnode_geth_data:/root/ethdata
+      - ../config/fixturenet-plugeth/plugins:/root/ethdata/plugins
    ports:
      - "9898"
      - "30303"
@@ -19,7 +20,7 @@ services:
    cap_add:
      - SYS_PTRACE
    environment:
-      CERC_REMOTE_DEBUG: ${CERC_REMOTE_DEBUG:-true}
+      CERC_REMOTE_DEBUG: "true"
      CERC_RUN_STATEDIFF: "detect"
      CERC_STATEDIFF_DB_NODE_ID: 1
      CERC_SCRIPT_DEBUG: ${CERC_SCRIPT_DEBUG}
@@ -65,7 +66,7 @@ services:
    hostname: fixturenet-eth-bootnode-lighthouse
    environment:
      RUN_BOOTNODE: "true"
-    image: cerc/fixturenet-eth-lighthouse:local
+    image: cerc/fixturenet-plugeth-lighthouse:local

  fixturenet-eth-lighthouse-1:
    restart: always
@@ -82,7 +83,7 @@ services:
      NODE_NUMBER: "1"
      ETH1_ENDPOINT: "http://fixturenet-eth-geth-1:8545"
      EXECUTION_ENDPOINT: "http://fixturenet-eth-geth-1:8551"
-    image: cerc/fixturenet-eth-lighthouse:local
+    image: cerc/fixturenet-plugeth-lighthouse:local
    volumes:
      - fixturenet_plugeth_lighthouse_1_data:/opt/testnet/build/cl
    depends_on:
@@ -109,7 +110,7 @@ services:
      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-eth-lighthouse:local
+    image: cerc/fixturenet-plugeth-lighthouse:local
    volumes:
      - fixturenet_plugeth_lighthouse_2_data:/opt/testnet/build/cl
    depends_on:
@@ -25,8 +25,8 @@ services:
      PROM_HTTP: "true"
      PROM_HTTP_ADDR: "0.0.0.0"
      PROM_HTTP_PORT: "8090"
-      LOG_LEVEL: "debug"
-      CERC_REMOTE_DEBUG: ${CERC_REMOTE_DEBUG:-true}
+      LOGRUS_LEVEL: "debug"
+      CERC_REMOTE_DEBUG: "true"
    volumes:
      - type: bind
        source: ../config/ipld-eth-server/chain.json
@@ -14,14 +14,12 @@ services:
      CERC_APP_WATCHER_URL: ${CERC_APP_WATCHER_URL}
      CERC_RELAY_NODES: ${CERC_RELAY_NODES}
      CERC_DENY_MULTIADDRS: ${CERC_DENY_MULTIADDRS}
-      CERC_RELEASE: "v0.1.5"
-      CERC_USE_NPM: true
-      CERC_CONFIG_FILE: "src/config.json"
+      CERC_BUILD_DIR: "@cerc-io/mobymask-ui/build"
    working_dir: /scripts
    command: ["sh", "mobymask-app-start.sh"]
    volumes:
+      - ../config/network/wait-for-it.sh:/scripts/wait-for-it.sh
      - ../config/watcher-mobymask-v2/mobymask-app-start.sh:/scripts/mobymask-app-start.sh
-      - ../config/watcher-mobymask-v2/mobymask-app-config.json:/app/src/mobymask-app-config.json
      - peers_ids:/peers
      - mobymask_deployment:/server
    ports:
@@ -48,14 +46,12 @@ services:
      CERC_APP_WATCHER_URL: ${CERC_APP_WATCHER_URL}
      CERC_RELAY_NODES: ${CERC_RELAY_NODES}
      CERC_DENY_MULTIADDRS: ${CERC_DENY_MULTIADDRS}
-      CERC_RELEASE: "v0.1.5-lxdao-0.1.1"
-      CERC_USE_NPM: false
-      CERC_CONFIG_FILE: "src/utils/config.json"
+      CERC_BUILD_DIR: "@cerc-io/mobymask-ui-lxdao/build"
    working_dir: /scripts
    command: ["sh", "mobymask-app-start.sh"]
    volumes:
+      - ../config/network/wait-for-it.sh:/scripts/wait-for-it.sh
      - ../config/watcher-mobymask-v2/mobymask-app-start.sh:/scripts/mobymask-app-start.sh
-      - ../config/watcher-mobymask-v2/mobymask-app-config.json:/app/src/mobymask-app-config.json
      - peers_ids:/peers
      - mobymask_deployment:/server
    ports:
@@ -1,187 +0,0 @@
-version: '3.2'
-
-services:
-  sushiswap-watcher-db:
-    restart: unless-stopped
-    image: postgres:14-alpine
-    environment:
-      - POSTGRES_USER=vdbm
-      - POSTGRES_MULTIPLE_DATABASES=erc20-watcher,sushi-watcher,sushi-info-watcher,erc20-watcher-job-queue,sushi-watcher-job-queue,sushi-info-watcher-job-queue
-      - POSTGRES_EXTENSION=erc20-watcher-job-queue:pgcrypto,sushi-watcher-job-queue:pgcrypto,sushi-info-watcher-job-queue:pgcrypto
-      - POSTGRES_PASSWORD=password
-    command: ["postgres", "-c", "shared_preload_libraries=pg_stat_statements", "-c", "pg_stat_statements.track=all", "-c", "work_mem=2GB"]
-    volumes:
-      - ../config/postgresql/multiple-postgressql-databases.sh:/docker-entrypoint-initdb.d/multiple-postgressql-databases.sh
-      - ../config/postgresql/create-pg-stat-statements.sql:/docker-entrypoint-initdb.d/create-pg-stat-statements.sql
-      - sushiswap_watcher_db_data:/var/lib/postgresql/data
-    ports:
-      - "0.0.0.0:15435:5432"
-    healthcheck:
-      test: ["CMD", "nc", "-v", "localhost", "5432"]
-      interval: 20s
-      timeout: 5s
-      retries: 15
-      start_period: 10s
-    shm_size: '8GB'
-
-  erc20-watcher-server:
-    restart: unless-stopped
-    depends_on:
-      sushiswap-watcher-db:
-        condition: service_healthy
-    image: cerc/watcher-sushiswap:local
-    working_dir: /app/packages/erc20-watcher
-    environment:
-      - DEBUG=vulcanize:*
-    command: ["node", "--enable-source-maps", "dist/server.js"]
-    volumes:
-      - ../config/watcher-sushiswap/erc20-watcher.toml:/app/packages/erc20-watcher/environments/local.toml
-    ports:
-      - "0.0.0.0:3005:3001"
-    healthcheck:
-      test: ["CMD", "nc", "-v", "localhost", "3001"]
-      interval: 20s
-      timeout: 5s
-      retries: 15
-      start_period: 5s
-    extra_hosts:
-      - "host.docker.internal:host-gateway"
-
-  sushi-watcher-job-runner:
-    restart: unless-stopped
-    depends_on:
-      sushiswap-watcher-db:
-        condition: service_healthy
-      lotus-node-1:
-        condition: service_healthy
-    image: cerc/watcher-sushiswap:local
-    working_dir: /app/packages/uni-watcher
-    environment:
-      - DEBUG=vulcanize:*
-    command: ["node", "--enable-source-maps", "dist/job-runner.js"]
-    volumes:
-      - ../config/watcher-sushiswap/sushi-watcher.toml:/app/packages/uni-watcher/environments/local.toml
-      - ../config/watcher-sushiswap/sushi-watcher-test.toml:/app/packages/uni-watcher/environments/test.toml
-    ports:
-      - "0.0.0.0:9004:9000"
-    healthcheck:
-      test: ["CMD", "nc", "-v", "localhost", "9000"]
-      interval: 20s
-      timeout: 5s
-      retries: 15
-      start_period: 5s
-    extra_hosts:
-      - "host.docker.internal:host-gateway"
-
-  sushi-watcher-server:
-    restart: unless-stopped
-    depends_on:
-      sushiswap-watcher-db:
-        condition: service_healthy
-      sushi-watcher-job-runner:
-        condition: service_healthy
-    image: cerc/watcher-sushiswap:local
-    env_file:
-      - ../config/watcher-sushiswap/lotus-params.env
-    environment:
-      - DEBUG=vulcanize:*
-    working_dir: /app/packages/uni-watcher
-    command: ["node", "--enable-source-maps", "dist/server.js"]
-    volumes:
-      - ../config/watcher-sushiswap/sushi-watcher.toml:/app/packages/uni-watcher/environments/local.toml
-      - ../config/watcher-sushiswap/sushi-watcher-test.toml:/app/packages/uni-watcher/environments/test.toml
-    ports:
-      - "0.0.0.0:3003:3003"
-      - "0.0.0.0:9005:9001"
-    healthcheck:
-      test: ["CMD", "nc", "-v", "localhost", "3003"]
-      interval: 20s
-      timeout: 5s
-      retries: 15
-      start_period: 5s
-    extra_hosts:
-      - "host.docker.internal:host-gateway"
-
-  sushi-info-watcher-job-runner:
-    restart: unless-stopped
-    depends_on:
-      sushiswap-watcher-db:
-        condition: service_healthy
-      erc20-watcher-server:
-        condition: service_healthy
-      lotus-node-1:
-        condition: service_healthy
-      sushi-watcher-server:
-        condition: service_healthy
-    image: cerc/watcher-sushiswap:local
-    working_dir: /app/packages/uni-info-watcher
-    environment:
-      - DEBUG=vulcanize:*
-    command: ["node", "--enable-source-maps", "dist/job-runner.js"]
-    volumes:
-      - ../config/watcher-sushiswap/sushi-info-watcher.toml:/app/packages/uni-info-watcher/environments/local.toml
-      - ../config/watcher-sushiswap/sushi-info-watcher-test.toml:/app/packages/uni-info-watcher/environments/test.toml
-    ports:
-      - "0.0.0.0:9006:9002"
-    healthcheck:
-      test: ["CMD", "nc", "-v", "localhost", "9002"]
-      interval: 20s
-      timeout: 5s
-      retries: 15
-      start_period: 5s
-    extra_hosts:
-      - "host.docker.internal:host-gateway"
-
-  sushi-info-watcher-server:
-    restart: unless-stopped
-    depends_on:
-      sushiswap-watcher-db:
-        condition: service_healthy
-      erc20-watcher-server:
-        condition: service_healthy
-      sushi-watcher-server:
-        condition: service_healthy
-      sushi-info-watcher-job-runner:
-        condition: service_healthy
-    image: cerc/watcher-sushiswap:local
-    env_file:
-      - ../config/watcher-sushiswap/lotus-params.env
-    working_dir: /app/packages/uni-info-watcher
-    command: ["node", "--enable-source-maps", "dist/server.js"]
-    volumes:
-      - ../config/watcher-sushiswap/sushi-info-watcher.toml:/app/packages/uni-info-watcher/environments/local.toml
-      - ../config/watcher-sushiswap/sushi-info-watcher-test.toml:/app/packages/uni-info-watcher/environments/test.toml
-    ports:
-      - "0.0.0.0:3004:3004"
-      - "0.0.0.0:9007:9003"
-    healthcheck:
-      test: ["CMD", "nc", "-v", "localhost", "3004"]
-      interval: 20s
-      timeout: 5s
-      retries: 15
-      start_period: 5s
-    extra_hosts:
-      - "host.docker.internal:host-gateway"
-
-  sushiswap-v3-info:
-    depends_on:
-      sushi-info-watcher-server:
-        condition: service_healthy
-    image: cerc/uniswap-v3-info:local
-    ports:
-      - "0.0.0.0:3006:3000"
-
-  # Deploys the core (UniswapV3Factory) contract
-  sushiswap-v3-core:
-    image: cerc/sushiswap-v3-core:local
-    env_file:
-      - ../config/watcher-sushiswap/lotus-params.env
-
-  # Deploys the periphery (NFPM, token, etc.) contracts
-  sushiswap-v3-periphery:
-    image: cerc/sushiswap-v3-periphery:local
-    env_file:
-      - ../config/watcher-sushiswap/lotus-params.env
-
-volumes:
-  sushiswap_watcher_db_data:
@@ -75,6 +75,8 @@ services:
  uni-watcher-server:
    restart: unless-stopped
    depends_on:
+      ipld-eth-server:
+        condition: service_healthy
      uniswap-watcher-db:
        condition: service_healthy
      uni-watcher-job-runner:
@@ -18,8 +18,7 @@ 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_LOG_STATEMENTS="${CERC_STATEDIFF_DB_LOG_STATEMENTS:-false}"
+CERC_STATEDIFF_DB_LOG_STATEMENTS="false"
 CERC_STATEDIFF_WORKERS=2

 CERC_GETH_VMODULE="statediff/*=5,rpc/*=5"
-CERC_GETH_VERBOSITY=${CERC_GETH_VERBOSITY:-3}
@@ -1,20 +0,0 @@
-#!/bin/bash
-
-# ETH account with pk c05fd3613bcd62a4f25e5eba1f464d0b76d74c3f771a7c2f13e26ad6439444b3
-ETH_ADDRESS=0xD375B03bd3A2434A9f675bEC4Ccd68aC5e67C743
-AMOUNT=1000
-
-# Pre-fund stat
-PREFUND_STAT_OUTPUT=$(lotus evm stat $ETH_ADDRESS)
-
-FILECOIN_ADDRESS=$(echo "$PREFUND_STAT_OUTPUT" | grep -oP 'Filecoin address:\s+\K\S+')
-echo Filecoin address: "$FILECOIN_ADDRESS"
-
-echo Sending balance to "$FILECOIN_ADDRESS"
-lotus send --from $(lotus wallet default) "$FILECOIN_ADDRESS" $AMOUNT
-
-# Post-fund stat
-echo lotus evm stat $ETH_ADDRESS
-lotus evm stat $ETH_ADDRESS
-
-echo "Account with ETH address $ETH_ADDRESS funded"
@@ -0,0 +1 @@
+}+V�{iνΆΠΉ�²�¨ΣΗ\k»qς␍—?δΪAΒfκ’~μ©™LΉ�tb·yqτ·²ηξΔ�Ο?ξaΣ�J
@@ -0,0 +1 @@
+Βfκ’~μ©™LΉ�tb·yqτ·²ηξΔ�Ο?ξaΣ�J
@@ -0,0 +1,71 @@
+{
+  "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
+      }
+    ]
+  }
+}
@@ -0,0 +1 @@
+7b2254797065223a22626c73222c22507269766174654b6579223a227446765352695367324733537367673050535979323358796a61494d5870736d64794732423755464c54343d227d
@@ -0,0 +1,11 @@
+{
+  "ID": "f355523e-69d0-4984-bd0e-9588487c6231",
+  "Weight": 0,
+  "CanSeal": false,
+  "CanStore": false,
+  "MaxStorage": 0,
+  "Groups": null,
+  "AllowTo": null,
+  "AllowTypes": null,
+  "DenyTypes": null
+}
@@ -0,0 +1,108 @@
+{
+  "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,6 +1,5 @@
-LOTUS_PATH=/root/.lotus-local-net
-LOTUS_MINER_PATH=/root/.lotus-miner-local-net
+LOTUS_PATH=~/.lotus-local-net
+LOTUS_MINER_PATH=~/.lotus-miner-local-net
 LOTUS_SKIP_GENESIS_CHECK=_yes_
-LOTUS_FEVM_ENABLEETHRPC=true
 CGO_CFLAGS_ALLOW="-D__BLST_PORTABLE__"
 CGO_CFLAGS="-D__BLST_PORTABLE__"
@@ -2,48 +2,34 @@

 lotus --version

-# remove old bootnode peer info if present
-if [ -f /root/.lotus-shared/miner.addr ]; then
-  rm /root/.lotus-shared/miner.addr
-fi
+# # remove old bootnode peer info if present
+# [ -f /root/.lotus-shared/miner.addr ] && rm /root/.lotus-shared/miner.addr

-# Check if filecoin-proof-parameters exist; avoid fetching if they do
-if [ -z "$(find "/var/tmp/filecoin-proof-parameters" -maxdepth 1 -type f)" ]; then
-  echo "Proof params not found, fetching..."
-  lotus fetch-params 2048
-else
-  echo "Existing proof params found"
-fi
+##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

-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 --lotus-make-genesis=devgen.car --profile=bootstrapper --genesis-template=localnet.json --bootstrap=false > /var/log/lotus.log 2>&1 &
+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
+    sleep 5
 done
 echo "Daemon started."

-# copy genesis file to shared volume
-cp /devgen.car /root/.lotus-shared
-
 # publish bootnode peer info to shared volume
-# TODO: Improve exporting public address to shared volume
-lotus net listen | awk 'NR==4{print}' > /root/.lotus-shared/miner.addr
+lotus net listen | awk 'NR==1{print}' > /root/.lotus-shared/miner.addr

 # if miner not already initialized
-if [ ! -d $LOTUS_MINER_PATH ]; then
+if [ ! -d /root/.lotus-miner-local-net ]; then
  # initialize miner
  lotus wallet import --as-default ~/.genesis-sectors/pre-seal-t01000.key
-
-  # fund a known account for usage
-  /fund-account.sh
-
  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

@@ -2,28 +2,23 @@

 lotus --version

-# Loop until the daemon is started
-echo "Waiting for miner to share peering info..."
-while [ ! -f /root/.lotus-shared/miner.addr ]; do
-  sleep 5
-done
-echo "Resuming..."
+##TODO: paths can use values from lotus-env.env file

 # if not already initialized
-if [ ! -f $LOTUS_PATH/config.toml ]; then
+if [ ! -f /root/.lotus-local-net/config.toml ]; then
  # init node config
-  mkdir $LOTUS_PATH
-  lotus config default > $LOTUS_PATH/config.toml
+  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]" $LOTUS_PATH/config.toml
+    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=/root/.lotus-shared/devgen.car
+lotus daemon --genesis=/devgen.car
@@ -0,0 +1 @@
+See: https://docs.plugeth.org/
@@ -23,8 +23,6 @@ cleanup() {
    echo "Done"
 }

-trap 'cleanup' SIGINT SIGTERM
-
 $START_CMD \
    --datadir="${CERC_ETH_DATADIR}" \
    --authrpc.addr="0.0.0.0" \
@@ -1,7 +0,0 @@
-{
-  "name": "MobyMask",
-  "relayNodes": [],
-  "peer": {
-    "enableDebugInfo": true
-  }
-}
@@ -33,23 +33,11 @@ else
  echo "Taking deployed contract details from env"
 fi

-cd /app
-git checkout $CERC_RELEASE
+# Use yq to create config.yml with environment variables
+yq -n ".address = env(CERC_DEPLOYED_CONTRACT)" > /config/config.yml
+yq ".watcherUrl = env(CERC_APP_WATCHER_URL)" -i /config/config.yml
+yq ".chainId = env(CERC_CHAIN_ID)" -i /config/config.yml
+yq ".relayNodes = strenv(CERC_RELAY_NODES)" -i /config/config.yml
+yq ".denyMultiaddrs = strenv(CERC_DENY_MULTIADDRS)" -i /config/config.yml

-# Export config values in a json file
-jq --arg address "$CERC_DEPLOYED_CONTRACT" \
-  --argjson chainId "$CERC_CHAIN_ID" \
-  --argjson relayNodes "$CERC_RELAY_NODES" \
-  --argjson denyMultiaddrs "$CERC_DENY_MULTIADDRS" \
-  '.address = $address | .chainId = $chainId | .relayNodes = $relayNodes | .peer.denyMultiaddrs = $denyMultiaddrs' \
-  /app/src/mobymask-app-config.json > /app/${CERC_CONFIG_FILE}
-
-if [ "${CERC_USE_NPM}" = "true" ]; then
-  npm install
-  REACT_APP_WATCHER_URI="$CERC_APP_WATCHER_URL/graphql" npm run build
-else
-  yarn install
-  REACT_APP_WATCHER_URI="$CERC_APP_WATCHER_URL/graphql" yarn build
-fi
-
-http-server -p 80 /app/build
+/scripts/start-serving-app.sh
@@ -1,39 +0,0 @@
-[server]
-  host = "0.0.0.0"
-  port = 3001
-  mode = "eth_call"
-  kind = "lazy"
-
-[metrics]
-  host = "127.0.0.1"
-  port = 9000
-    [metrics.gql]
-    port = 9001
-
-[database]
-  type = "postgres"
-  host = "sushiswap-watcher-db"
-  port = 5432
-  database = "erc20-watcher"
-  username = "vdbm"
-  password = "password"
-  synchronize = true
-  logging = false
-  maxQueryExecutionTime = 100
-
-[upstream]
-  [upstream.ethServer]
-    rpcProviderEndpoint = "http://lotus-node-1:1234/rpc/v1"
-    rpcClient = true
-
-  [upstream.cache]
-    name = "requests"
-    enabled = false
-    deleteOnStart = false
-
-[jobQueue]
-  dbConnectionString = "postgres://vdbm:password@sushiswap-watcher-db:5432/erc20-watcher-job-queue"
-  maxCompletionLagInSecs = 300
-  jobDelayInMilliSecs = 100
-  eventsInBatch = 50
-  blockDelayInMilliSecs = 2000
@@ -1,6 +0,0 @@
-# Lotus node config
-ETH_RPC_ENDPOINT="http://lotus-node-1:1234/rpc/v1"
-CHAIN_ID=31415926
-
-# From app/data/config/fixturenet-lotus/fund-account.sh
-ACCOUNT_PRIVATE_KEY="0xc05fd3613bcd62a4f25e5eba1f464d0b76d74c3f771a7c2f13e26ad6439444b3"
@@ -1,45 +0,0 @@
-[server]
-  host = "0.0.0.0"
-  port = 3004
-  # Use mode demo when running watcher locally.
-  # Mode demo whitelists all tokens so that entity values get updated.
-  mode = "demo"
-
-[database]
-  type = "postgres"
-  host = "sushiswap-watcher-db"
-  port = 5432
-  database = "sushi-info-watcher"
-  username = "vdbm"
-  password = "password"
-  synchronize = true
-  logging = false
-  maxQueryExecutionTime = 100
-
-[upstream]
-  [upstream.ethServer]
-    rpcProviderEndpoint = "http://lotus-node-1:1234/rpc/v1"
-    rpcClient = true
-
-  [upstream.cache]
-    name = "requests"
-    enabled = false
-    deleteOnStart = false
-
-  [upstream.uniWatcher]
-    gqlEndpoint = "http://sushi-watcher-server:3003/graphql"
-    gqlSubscriptionEndpoint = "ws://sushi-watcher-server:3003/graphql"
-
-  [upstream.tokenWatcher]
-    gqlEndpoint = "http://erc20-watcher-server:3001/graphql"
-    gqlSubscriptionEndpoint = "ws://erc20-watcher-server:3001/graphql"
-
-[jobQueue]
-  dbConnectionString = "postgres://vdbm:password@sushiswap-watcher-db:5432/sushi-info-watcher-job-queue"
-  maxCompletionLagInSecs = 300
-  jobDelayInMilliSecs = 1000
-  eventsInBatch = 50
-  subgraphEventsOrder = true
-  blockDelayInMilliSecs = 2000
-  prefetchBlocksInMem = false
-  prefetchBlockCount = 10
@@ -1,90 +0,0 @@
-[server]
-  host = "0.0.0.0"
-  port = 3004
-  mode = "demo"
-  kind = "active"
-
-  # Checkpointing state.
-  checkpointing = true
-
-  # Checkpoint interval in number of blocks.
-  checkpointInterval = 50000
-
-  # Enable state creation
-  enableState = false
-
-  # Max block range for which to return events in eventsInRange GQL query.
-  # Use -1 for skipping check on block range.
-  maxEventsBlockRange = 1000
-
-  # Interval in number of blocks at which to clear entities cache.
-  clearEntitiesCacheInterval = 1000
-
-  # Boolean to skip updating entity fields required in state creation and not required in the frontend.
-  skipStateFieldsUpdate = false
-
-  # Boolean to load GQL query nested entity relations sequentially.
-  loadRelationsSequential = false
-
-  # Max GQL API requests to process simultaneously (defaults to 1).
-  maxSimultaneousRequests = 1
-
-  # 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 = 9002
-  [metrics.gql]
-    port = 9003
-
-[database]
-  type = "postgres"
-  host = "sushiswap-watcher-db"
-  port = 5432
-  database = "sushi-info-watcher"
-  username = "vdbm"
-  password = "password"
-  synchronize = true
-  logging = false
-  maxQueryExecutionTime = 100
-
-  [database.extra]
-    # maximum number of clients the pool should contain
-    max = 20
-
-[upstream]
-  [upstream.ethServer]
-    rpcProviderEndpoint = "http://lotus-node-1:1234/rpc/v1"
-    rpcClient = true
-
-  [upstream.cache]
-    name = "requests"
-    enabled = false
-    deleteOnStart = false
-
-  [upstream.uniWatcher]
-    gqlEndpoint = "http://sushi-watcher-server:3003/graphql"
-    gqlSubscriptionEndpoint = "ws://sushi-watcher-server:3003/graphql"
-
-  [upstream.tokenWatcher]
-    gqlEndpoint = "http://erc20-watcher-server:3001/graphql"
-    gqlSubscriptionEndpoint = "ws://erc20-watcher-server:3001/graphql"
-
-[jobQueue]
-  dbConnectionString = "postgres://vdbm:password@sushiswap-watcher-db:5432/sushi-info-watcher-job-queue"
-  maxCompletionLagInSecs = 300
-  jobDelayInMilliSecs = 1000
-  eventsInBatch = 50
-  subgraphEventsOrder = true
-  blockDelayInMilliSecs = 2000
-  prefetchBlocksInMem = false
-  prefetchBlockCount = 10
@@ -1,34 +0,0 @@
-[server]
-  host = "0.0.0.0"
-  port = 3003
-
-[database]
-  type = "postgres"
-  host = "sushiswap-watcher-db"
-  port = 5432
-  database = "sushi-watcher"
-  username = "vdbm"
-  password = "password"
-  synchronize = true
-  logging = false
-  maxQueryExecutionTime = 100
-
-[upstream]
-  [upstream.ethServer]
-    rpcProviderEndpoint = "http://lotus-node-1:1234/rpc/v1"
-    rpcClient = true
-
-  [upstream.cache]
-    name = "requests"
-    enabled = false
-    deleteOnStart = false
-
-[jobQueue]
-  dbConnectionString = "postgres://vdbm:password@sushiswap-watcher-db:5432/sushi-watcher-job-queue"
-  maxCompletionLagInSecs = 300
-  jobDelayInMilliSecs = 0
-  eventsInBatch = 50
-  lazyUpdateBlockProgress = true
-  blockDelayInMilliSecs = 2000
-  prefetchBlocksInMem = false
-  prefetchBlockCount = 10
@@ -1,41 +0,0 @@
-[server]
-  host = "0.0.0.0"
-  port = 3003
-  kind = "active"
-
-[metrics]
-  host = "0.0.0.0"
-  port = 9000
-  [metrics.gql]
-    port = 9001
-
-[database]
-  type = "postgres"
-  host = "sushiswap-watcher-db"
-  port = 5432
-  database = "sushi-watcher"
-  username = "vdbm"
-  password = "password"
-  synchronize = true
-  logging = false
-  maxQueryExecutionTime = 100
-
-[upstream]
-  [upstream.ethServer]
-    rpcProviderEndpoint = "http://lotus-node-1:1234/rpc/v1"
-    rpcClient = true
-
-  [upstream.cache]
-    name = "requests"
-    enabled = false
-    deleteOnStart = false
-
-[jobQueue]
-  dbConnectionString = "postgres://vdbm:password@sushiswap-watcher-db:5432/sushi-watcher-job-queue"
-  maxCompletionLagInSecs = 300
-  jobDelayInMilliSecs = 0
-  eventsInBatch = 50
-  lazyUpdateBlockProgress = true
-  blockDelayInMilliSecs = 2000
-  prefetchBlocksInMem = false
-  prefetchBlockCount = 10
@@ -23,8 +23,8 @@

 [upstream]
  [upstream.ethServer]
-    gqlApiEndpoint = "http://ipld-eth-server.example.com:8083/graphql"
-    rpcProviderEndpoint = "http://ipld-eth-server.example.com:8082"
+    gqlApiEndpoint = "http://ipld-eth-server:8082/graphql"
+    rpcProviderEndpoint = "http://ipld-eth-server:8081"

  [upstream.cache]
    name = "requests"
@@ -63,8 +63,8 @@

 [upstream]
  [upstream.ethServer]
-    gqlApiEndpoint = "http://ipld-eth-server.example.com:8083/graphql"
-    rpcProviderEndpoint = "http://ipld-eth-server.example.com:8082"
+    gqlApiEndpoint = "http://ipld-eth-server:8082/graphql"
+    rpcProviderEndpoint = "http://ipld-eth-server:8081"

  [upstream.cache]
    name = "requests"
@@ -22,8 +22,8 @@

 [upstream]
  [upstream.ethServer]
-    gqlApiEndpoint = "http://ipld-eth-server.example.com:8083/graphql"
-    rpcProviderEndpoint = "http://ipld-eth-server.example.com:8082"
+    gqlApiEndpoint = "http://ipld-eth-server:8082/graphql"
+    rpcProviderEndpoint = "http://ipld-eth-server:8081"

  [upstream.cache]
    name = "requests"
@@ -1,27 +0,0 @@
-FROM skylenet/ethereum-genesis-generator@sha256:210353ce7c898686bc5092f16c61220a76d357f51eff9c451e9ad1b9ad03d4d3 AS ethgen
-
-FROM golang:1.20-alpine as builder
-
-RUN apk add --no-cache python3 py3-pip
-
-COPY genesis /opt/genesis
-
-# Install ethereum-genesis-generator tools
-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 cd /apps/el-gen && pip3 install -r requirements.txt
-# web3==5.24.0 used by el-gen is broken on python 3.11
-RUN pip3 install --upgrade "web3==6.5.0"
-
-# Build genesis config
-RUN apk add --no-cache make bash envsubst jq
-RUN cd /opt/genesis && make genesis-el
-
-# Snag the genesis block info.
-RUN go install github.com/cerc-io/eth-dump-genblock@latest
-RUN eth-dump-genblock /opt/genesis/build/el/geth.json > /opt/genesis/build/el/genesis_block.json
-
-FROM alpine:latest
-
-COPY --from=builder /opt/genesis /opt/genesis
@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-# Build cerc/fixturenet-eth-genesis
-
-source ${CERC_CONTAINER_BASE_DIR}/build-base.sh
-
-SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
-
-docker build -t cerc/fixturenet-eth-genesis:local -f ${SCRIPT_DIR}/Dockerfile ${build_command_args} $SCRIPT_DIR
@@ -1,21 +1,39 @@
-FROM cerc/fixturenet-eth-genesis:local as fnetgen
-FROM cerc/go-ethereum:local as geth
+FROM skylenet/ethereum-genesis-generator@sha256:210353ce7c898686bc5092f16c61220a76d357f51eff9c451e9ad1b9ad03d4d3 AS ethgen

 # Using the same golang image as used to build geth: https://github.com/cerc-io/go-ethereum/blob/HEAD/Dockerfile
-FROM golang:1.20-alpine as delve
+FROM golang:1.18-alpine as delve
 RUN go install github.com/go-delve/delve/cmd/dlv@latest

+FROM cerc/go-ethereum:local as geth
+
 FROM alpine:3.17
+RUN apk add --no-cache python3 python3-dev py3-pip curl wget jq build-base gettext libintl openssl bash bind-tools postgresql-client

-RUN apk add --no-cache bash wget python3 bind-tools postgresql-client
+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 cd /apps/el-gen && pip3 install -r requirements.txt
+
+COPY genesis /opt/testnet
 COPY run-el.sh /opt/testnet/run.sh

-COPY --from=delve /go/bin/dlv /usr/local/bin/
-COPY --from=geth /usr/local/bin/geth /usr/local/bin/
-COPY --from=fnetgen /opt/genesis /opt/testnet
+RUN cd /opt/testnet && make genesis-el

-# Initialize the geth db with our config
+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"]
@@ -1,6 +1,6 @@
 FROM cerc/lighthouse-cli:local AS lcli
 FROM skylenet/ethereum-genesis-generator@sha256:210353ce7c898686bc5092f16c61220a76d357f51eff9c451e9ad1b9ad03d4d3 AS ethgen
-FROM cerc/fixturenet-eth-genesis:local AS fnetgen
+FROM cerc/fixturenet-eth-geth:local AS fnetgeth

 FROM cerc/lighthouse:local

@@ -19,8 +19,8 @@ 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=fnetgen /opt/genesis/el /opt/testnet/el
-COPY --from=fnetgen /opt/genesis/build/el /opt/testnet/build/el
+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

@@ -44,7 +44,7 @@ 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 '.hash' | cut -d'x' -f2`}
+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'`}
@@ -0,0 +1,34 @@
+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"]
@@ -0,0 +1,20 @@
+#!/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,25 +1,42 @@
-FROM cerc/fixturenet-eth-genesis:local as fnetgen
+FROM skylenet/ethereum-genesis-generator@sha256:210353ce7c898686bc5092f16c61220a76d357f51eff9c451e9ad1b9ad03d4d3 AS ethgen

-# Using the same golang image as used to build geth: https://github.com/cerc-io/go-ethereum/blob/HEAD/Dockerfile
-FROM golang:1.20-alpine as delve
+FROM golang:1.19-alpine as delve
 RUN go install github.com/go-delve/delve/cmd/dlv@latest

-FROM cerc/plugeth-statediff:local as statediff
-# FIXME: fork of plugeth, use stock after upstreaming patches
 FROM cerc/plugeth:local as geth
+FROM cerc/plugeth-statediff:local as statediff

 FROM alpine:3.17
+RUN apk add --no-cache python3 python3-dev py3-pip curl wget jq build-base gettext libintl openssl bash bind-tools postgresql-client

-RUN apk add --no-cache bash wget python3 bind-tools postgresql-client
+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 cd /apps/el-gen && pip3 install -r requirements.txt
+
+COPY genesis /opt/testnet
 COPY run-el.sh /opt/testnet/run.sh

-COPY --from=delve /go/bin/dlv /usr/local/bin/
-COPY --from=geth /usr/local/bin/geth /usr/local/bin/
-COPY --from=fnetgen /opt/genesis /opt/testnet
+RUN cd /opt/testnet && make genesis-el
+
+COPY --from=geth  /usr/local/bin/geth /usr/local/bin/
+
+RUN mkdir -p /usr/local/lib/plugeth/
 COPY --from=statediff  /usr/local/lib/statediff.so /usr/local/lib/plugeth/

-# Initialize the geth db with our config
+# 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"]
@@ -6,6 +6,10 @@ 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
@@ -1,4 +0,0 @@
-#!/usr/bin/env bash
-# Build a local version of the graphprotocol/graph-node image (among reasons: the upstream image is not built for arm)
-source ${CERC_CONTAINER_BASE_DIR}/build-base.sh
-docker build -t cerc/graph-node:local -f ${CERC_REPO_BASE_DIR}/graph-node/docker/Dockerfile ${build_command_args} ${CERC_REPO_BASE_DIR}/graph-node
@@ -1,7 +1,7 @@
 ARG TAG_SUFFIX="-modern"
-FROM sigp/lighthouse:v4.3.0${TAG_SUFFIX}
+FROM sigp/lighthouse:v4.1.0${TAG_SUFFIX}

-RUN apt-get update; apt-get install bash netcat curl less jq wget -y;
+RUN apt-get update; apt-get install bash netcat curl less jq -y;

 WORKDIR /root/
 ADD start-lighthouse.sh .
@@ -1,5 +1,5 @@
 #####################################
-FROM golang:1.19.12-bullseye AS lotus-builder
+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
@@ -59,7 +59,7 @@ 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.*  /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 \
@@ -98,9 +98,6 @@ CMD ["-help"]
 #####################################
 FROM lotus-base AS lotus-all-in-one

-# Install netcat for healthcheck
-RUN apt-get update && apt-get install -y netcat
-
 ENV FILECOIN_PARAMETER_CACHE /var/tmp/filecoin-proof-parameters
 ENV LOTUS_MINER_PATH /var/lib/lotus-miner
 ENV LOTUS_PATH /var/lib/lotus
@@ -3,8 +3,8 @@
 source ${CERC_CONTAINER_BASE_DIR}/build-base.sh
 SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )

-# Use a release version tag to match the modified Dockerfile replaced in next step
-git -C ${CERC_REPO_BASE_DIR}/lotus checkout v1.23.3
+# 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
@@ -6,6 +6,9 @@ FROM node:${VARIANT}
 ARG USERNAME=node
 ARG NPM_GLOBAL=/usr/local/share/npm-global

+# This container pulls npm package from a registry configured via env var
+ARG CERC_NPM_REGISTRY_URL
+
 # Add NPM global to PATH.
 ENV PATH=${NPM_GLOBAL}/bin:${PATH}
 # Prevents npm from printing version warnings
@@ -30,14 +33,28 @@ RUN \
 RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
    && apt-get -y install --no-install-recommends jq bash netcat

+# We do this to get a yq binary from the published container, for the correct architecture we're building here
+COPY --from=docker.io/mikefarah/yq:latest /usr/bin/yq /usr/local/bin/yq
+
 RUN mkdir -p /scripts
+COPY ./apply-webapp-config.sh /scripts
+COPY ./start-serving-app.sh /scripts
+
+# Configure the local npm registry
+RUN npm config set @cerc-io:registry ${CERC_NPM_REGISTRY_URL}
+
+RUN mkdir -p /config

 # Install simple web server for now (use nginx perhaps later)
 RUN yarn global add http-server

-WORKDIR /app
-COPY . .
-RUN npm install
+# Globally install both versions of the payload web app package
+# Install old version of MobyMask web app
+RUN yarn global add @cerc-io/mobymask-ui@0.1.4
+# Install the LXDAO version of MobyMask web app
+RUN yarn global add @cerc-io/mobymask-ui-lxdao@npm:@cerc-io/mobymask-ui@0.1.4-lxdao-0.1.1

 # Expose port for http
 EXPOSE 80
+
+CMD ["/scripts/start-serving-app.sh"]
@@ -0,0 +1,42 @@
+#!/usr/bin/env bash
+if [ -n "$CERC_SCRIPT_DEBUG" ]; then
+    set -x
+fi
+if [[ $# -ne 3 ]]; then
+    echo "Illegal number of parameters" >&2
+    exit 1
+fi
+config_file_name=$1
+webapp_files_dir=$2
+config_prefix=$3
+if ! [[ -f ${config_file_name} ]]; then
+    echo "Config file ${config_file_name} does not exist" >&2
+    exit 1
+fi
+if ! [[ -d ${webapp_files_dir} ]]; then
+    echo "Webapp directory ${webapp_files_dir} does not exist" >&2
+    exit 1
+fi
+# First some magic using sed to translate our yaml config file into an array of key value pairs like:
+# ${config_prefix}<path-through-objects>=<value>
+# sed "s/'//g" is used to remove single quote for relayNodes value
+readarray -t config_kv_pair_array < <( sed -E 's/([^:]+):\s*(.*)/\1=\2/g' ${config_file_name} | sed "s/'//g" |  sed "s/^/${config_prefix}_/" )
+declare -p config_kv_pair_array
+# Then iterate over that kv array making the template substitution in our web app files
+for kv_pair_string in "${config_kv_pair_array[@]}"
+do
+    kv_pair=(${kv_pair_string//=/ })
+    template_string_to_replace=${kv_pair[0]}
+    template_value_to_substitute=${kv_pair[1]}
+    # Run find and sed to do the substitution of one variable over all files
+    # See: https://stackoverflow.com/a/21479607/1701505
+    echo "Substituting: ${template_string_to_replace} = ${template_value_to_substitute}"
+
+    # TODO: Pass keys to be replaced without double quotes
+    if [[ "$template_string_to_replace" =~ ^${config_prefix}_(relayNodes|chainId|denyMultiaddrs)$ ]]; then
+        find ${webapp_files_dir} -type f -exec sed -i 's#"'"${template_string_to_replace}"'"#'"${template_value_to_substitute}"'#g' {} +
+    else
+        # Note: we do not escape our strings, on the expectation they do not container the '#' char.
+        find ${webapp_files_dir} -type f -exec sed -i 's#'${template_string_to_replace}'#'${template_value_to_substitute}'#g' {} +
+    fi
+done
@@ -8,4 +8,5 @@ SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )

 CERC_NPM_REGISTRY_URL="https://git.vdb.to/api/packages/cerc-io/npm/"

-docker build -t cerc/mobymask-ui:local  ${build_command_args} -f ${SCRIPT_DIR}/Dockerfile ${CERC_REPO_BASE_DIR}/mobymask-ui
+docker build -t cerc/mobymask-ui:local  ${build_command_args} -f ${SCRIPT_DIR}/Dockerfile \
+  --build-arg CERC_NPM_REGISTRY_URL ${SCRIPT_DIR}
@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+if [ -n "$CERC_SCRIPT_DEBUG" ]; then
+    set -x
+fi
+
+# TODO: Don't hard wire this:
+webapp_files_dir="/usr/local/share/.config/yarn/global/node_modules/${CERC_BUILD_DIR}"
+/scripts/apply-webapp-config.sh /config/config.yml ${webapp_files_dir} MOBYMASK_HOSTED_CONFIG
+http-server -p 80 ${webapp_files_dir}
@@ -1,4 +0,0 @@
-#!/usr/bin/env bash
-# Build cerc/plugeth-statediff
-source ${CERC_CONTAINER_BASE_DIR}/build-base.sh
-docker build -t cerc/plugeth-statediff:local ${build_command_args} ${CERC_REPO_BASE_DIR}/plugeth-statediff
@@ -1,4 +0,0 @@
-#!/usr/bin/env bash
-# Build cerc/plugeth
-source ${CERC_CONTAINER_BASE_DIR}/build-base.sh
-docker build -t cerc/plugeth:local ${build_command_args} ${CERC_REPO_BASE_DIR}/plugeth
@@ -1,14 +0,0 @@
-FROM node:18.15.0-alpine3.16
-
-RUN apk --update --no-cache add git python3 alpine-sdk bash
-RUN curl -L https://unpkg.com/@pnpm/self-installer | node
-
-WORKDIR /app
-
-COPY . .
-
-RUN echo "Installing dependencies..." && \
-  pnpm install
-
-# Keep container running for commands to be executed
-CMD ["tail", "-f"]
@@ -1,7 +0,0 @@
-#!/usr/bin/env bash
-
-# Build cerc/sushiswap-v3-core
-source ${CERC_CONTAINER_BASE_DIR}/build-base.sh
-SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
-
-docker build -t cerc/sushiswap-v3-core:local -f ${SCRIPT_DIR}/Dockerfile ${build_command_args} ${CERC_REPO_BASE_DIR}/sushiswap-v3-core
@@ -1,13 +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 "Installing dependencies..." && \
-  yarn install
-
-# Keep container running for commands to be executed
-CMD ["tail", "-f"]
@@ -1,7 +0,0 @@
-#!/usr/bin/env bash
-
-# Build cerc/sushiswap-v3-periphery
-source ${CERC_CONTAINER_BASE_DIR}/build-base.sh
-SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
-
-docker build -t cerc/sushiswap-v3-periphery:local -f ${SCRIPT_DIR}/Dockerfile ${build_command_args} ${CERC_REPO_BASE_DIR}/sushiswap-v3-periphery
@@ -1,10 +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 uniswap-watcher-ts" && \
-  yarn && yarn build && yarn build:contracts
@@ -1,9 +0,0 @@
-#!/usr/bin/env bash
-# Build cerc/watcher-sushiswap
-
-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-sushiswap:local -f ${SCRIPT_DIR}/Dockerfile ${build_command_args} ${CERC_REPO_BASE_DIR}/uniswap-watcher-ts
@@ -44,7 +44,3 @@ cerc/lotus
 cerc/go-opera
 cerc/lasso
 cerc/reth
-cerc/sushiswap-v3-core
-cerc/sushiswap-v3-periphery
-cerc/watcher-sushiswap
-cerc/graph-node
@@ -30,4 +30,3 @@ fixturenet-lotus
 mainnet-go-opera
 lasso
 reth
-watcher-sushiswap
@@ -37,8 +37,3 @@ git.vdb.to/cerc-io/test-project
 github.com/Fantom-foundation/go-opera
 github.com/cerc-io/lasso
 github.com/paradigmxyz/reth
-git.vdb.to/cerc-io/plugeth
-git.vdb.to/cerc-io/plugeth-statediff
-github.com/cerc-io/sushiswap-v3-core
-github.com/cerc-io/sushiswap-v3-periphery
-github.com/graphprotocol/graph-node
@@ -1,4 +1,4 @@
-# fixturenet-eth-loaded
+# fixturenet-eth

 A "loaded" version of fixturenet-eth, with all the bells and whistles enabled.

@@ -11,7 +11,6 @@ containers:
  - cerc/go-ethereum
  - cerc/lighthouse
  - cerc/lighthouse-cli
-  - cerc/fixturenet-eth-genesis
  - cerc/fixturenet-eth-geth
  - cerc/fixturenet-eth-lighthouse
  - cerc/ipld-eth-server
@@ -10,7 +10,6 @@ containers:
  - cerc/go-ethereum
  - cerc/lighthouse
  - cerc/lighthouse-cli
-  - cerc/fixturenet-eth-genesis
  - cerc/fixturenet-eth-geth
  - cerc/fixturenet-eth-lighthouse
  - cerc/tx-spammer
@@ -9,7 +9,6 @@ containers:
  - cerc/go-ethereum
  - cerc/lighthouse
  - cerc/lighthouse-cli
-  - cerc/fixturenet-eth-genesis
  - cerc/fixturenet-eth-geth
  - cerc/fixturenet-eth-lighthouse
  - cerc/foundry
@@ -1,3 +0,0 @@
-# Graph-Node Fixturenet
-
-Experimental
@@ -1,10 +0,0 @@
-version: "1.0"
-name: fixturenet-graph-node
-description: "A graph-node fixturenet"
-repos:
-  - github.com/graphprotocol/graph-node
-containers:
-  - cerc/graph-node
-pods:
-  - fixturenet-graph-node
-
@@ -12,17 +12,17 @@ $ laconic-so --stack fixturenet-lotus build-containers
 ```
 ## 3. Deploy the stack
 ```
-$ laconic-so --stack fixturenet-lotus deploy --cluster lotus up
+$ laconic-so --stack fixturenet-lotus deploy up
 ```
 Correct operation should be verified by checking the container logs with:
 ```
-$ laconic-so --stack fixturenet-lotus deploy --cluster lotus logs lotus-miner
-$ laconic-so --stack fixturenet-lotus deploy --cluster lotus logs lotus-node-1
-$ laconic-so --stack fixturenet-lotus deploy --cluster lotus logs lotus-node-2
+$ 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 --cluster lotus exec lotus-miner "lotus status"
-$ laconic-so --stack fixturenet-lotus deploy --cluster lotus exec lotus-node-1 "lotus status"
-$ laconic-so --stack fixturenet-lotus deploy --cluster lotus exec lotus-node-2 "lotus status"
-```
+$ 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"
+```
@@ -11,7 +11,6 @@ containers:
  - cerc/go-ethereum
  - cerc/lighthouse
  - cerc/lighthouse-cli
-  - cerc/fixturenet-eth-genesis
  - cerc/fixturenet-eth-geth
  - cerc/fixturenet-eth-lighthouse
  - cerc/foundry
@@ -2,28 +2,27 @@ version: "1.2"
 name: fixturenet-plugeth-tx
 decription: "plugeth Ethereum Fixturenet w/ tx-spammer"
 repos:
-  - git.vdb.to/cerc-io/plugeth@statediff
-  - git.vdb.to/cerc-io/plugeth-statediff
+  - github.com/cerc-io/tx-spammer
+  - github.com/dboreham/foundry
  - github.com/cerc-io/lighthouse
  - github.com/cerc-io/ipld-eth-db@v5
  - github.com/cerc-io/ipld-eth-server@v5
-  - github.com/cerc-io/tx-spammer
-  - github.com/dboreham/foundry
+  - git.vdb.to/cerc-io/plugeth@statediff-wip
+  - git.vdb.to/cerc-io/plugeth-statediff@dev-local-build
 containers:
-  - cerc/plugeth-statediff
-  - cerc/plugeth
-  - cerc/fixturenet-eth-genesis
-  - cerc/fixturenet-plugeth-plugeth
  - cerc/lighthouse
  - cerc/lighthouse-cli
-  - cerc/fixturenet-eth-lighthouse
+  - cerc/plugeth-statediff
+  - cerc/plugeth
+  - cerc/fixturenet-plugeth-plugeth
+  - cerc/fixturenet-plugeth-lighthouse
  - cerc/tx-spammer
  - cerc/foundry
  - cerc/ipld-eth-db
  - cerc/ipld-eth-server
 pods:
-  - fixturenet-plugeth
  - ipld-eth-db
  - ipld-eth-server
-  - tx-spammer
+  - fixturenet-plugeth
  - foundry
+  - tx-spammer
@@ -10,7 +10,6 @@ containers:
  - cerc/go-ethereum
  - cerc/lighthouse
  - cerc/lighthouse-cli
-  - cerc/fixturenet-eth-genesis
  - cerc/fixturenet-eth-geth
  - cerc/fixturenet-eth-lighthouse
  - cerc/pocket
@@ -70,41 +70,12 @@ To permanently *delete* the stack's data volumes run:
 $ laconic-so deployment --dir mainnet-eth-deployment stop --delete-data-volumes
 ```
 After deleting the volumes, any subsequent re-start will begin chain sync from cold.
-
-## Ports
-It is usually necessary to expose certain container ports on one or more the host's addresses to allow incoming connections.
-Any ports defined in the Docker compose file are exposed by default with random port assignments, but the values can be
-customized by editing the "spec" file generated by `laconic-so deploy init`.
-
-In this example, ports `8545` and `5052` have been assigned to a specific addresses/port combination on the host, while
-port `40000` has been left with random assignment:
-```
-$ cat mainnet-eth-spec.yml
-stack: mainnet-eth
-ports:
-  mainnet-eth-geth-1:
-   - '10.10.10.10:8545:8545'
-   - '40000'
-  mainnet-eth-lighthouse-1:
-   - '10.10.10.10:5052:5052'
-volumes:
-  mainnet_eth_config_data: ./data/mainnet_eth_config_data
-  mainnet_eth_geth_1_data: ./data/mainnet_eth_geth_1_data
-  mainnet_eth_lighthouse_1_data: ./data/mainnet_eth_lighthouse_1_data
-```
-
 ## Data volumes
 Container data volumes are bind-mounted to specified paths in the host filesystem.
 The default setup (generated by `laconic-so deploy init`) places the volumes in the `./data` subdirectory of the deployment directory:
 ```
 $ cat mainnet-eth-spec.yml
 stack: mainnet-eth
-ports:
-  mainnet-eth-geth-1:
-   - '10.10.10.10:8545:8545'
-   - '40000'
-  mainnet-eth-lighthouse-1:
-   - '10.10.10.10:5052:5052'
 volumes:
  mainnet_eth_config_data: ./data/mainnet_eth_config_data
  mainnet_eth_geth_1_data: ./data/mainnet_eth_geth_1_data
@@ -13,10 +13,9 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http:#www.gnu.org/licenses/>.

+from dataclasses import dataclass
 from app.util import get_yaml
-from app.deploy_types import DeployCommandContext, DeploymentContext
 from app.stack_state import State
-from app.deploy_util import VolumeMapping, run_container_command

 default_spec_file_content = """config:
    node_moniker: my-node-name
@@ -26,26 +25,38 @@ default_spec_file_content = """config:
 init_help_text = """Add helpful text here on setting config variables.
 """

+@dataclass
+class VolumeMapping:
+    host_path: str
+    container_path: str

-def setup(command_context: DeployCommandContext):
+
+# In order to make this, we need the ability to run the stack
+# In theory we can make this same way as we would run deploy up
+def run_container_command(ctx, ontainer, command, mounts):
+    deploy_context = ctx.obj
+    pass
+
+
+def setup(ctx):
    node_moniker = "dbdb-node"
    chain_id = "laconic_81337-1"
    mounts = [
        VolumeMapping("./path", "~/.laconicd")
    ]
-    output, status = run_container_command(command_context.cluster_context, "laconicd", f"laconicd init {node_moniker} --chain-id {chain_id}", mounts)
+    output, status = run_container_command(ctx, "laconicd", f"laconicd init {node_moniker} --chain-id {chain_id}", mounts)


-def init(command_context: DeployCommandContext):
+def init(command_context):
    print(init_help_text)
    yaml = get_yaml()
    return yaml.load(default_spec_file_content)


-def get_state(command_context: DeployCommandContext):
+def get_state(command_context):
    print("Here we get state")
    return State.CONFIGURED


-def change_state(command_context: DeployCommandContext):
+def change_state(command_context):
    pass
@@ -7,9 +7,8 @@ repos:
  - github.com/ethereum-optimism/optimism@v1.0.4
  - github.com/ethereum-optimism/op-geth@v1.101105.2
  - github.com/cerc-io/watcher-ts@v0.2.43
-  - github.com/cerc-io/mobymask-v2-watcher-ts@v0.1.2
+  - github.com/cerc-io/mobymask-v2-watcher-ts@v0.1.1
  - github.com/cerc-io/MobyMask@v0.1.2
-  - github.com/cerc-io/mobymask-ui
 containers:
  - cerc/go-ethereum
  - cerc/lighthouse
@@ -1,45 +0,0 @@
-# SushiSwap
-
-## Setup
-
-Clone required repositories:
-
-```bash
-laconic-so --stack sushiswap setup-repositories --git-ssh
-```
-
-Build the container images:
-
-```bash
-laconic-so --stack sushiswap build-containers
-```
-
-## Deploy
-
-Deploy the stack:
-
-```bash
-laconic-so --stack sushiswap deploy --cluster sushiswap up
-```
-
-## Tests
-
-Follow [smoke-tests.md](./smoke-tests.md) to run smoke tests
-
-## Clean up
-
-Stop all the services running in background run:
-
-```bash
-laconic-so --stack sushiswap deploy --cluster sushiswap down
-```
-
-Clear volumes created by this stack:
-
-```bash
-# List all relevant volumes
-docker volume ls -q --filter "name=sushiswap"
-
-# Remove all the listed volumes
-docker volume rm $(docker volume ls -q --filter "name=sushiswap")
-```
@@ -1,71 +0,0 @@
-# SushiSwap Watcher Smoke Tests
-
-## sushi-watcher
-
-Deploy required contracts and set the addresses to variables:
-
-```bash
-# Deploy UniswapV3Factory
-docker exec -it sushiswap-sushiswap-v3-core-1 pnpm hardhat --network docker deploy --tags UniswapV3Factory
-
-# Set the returned address to a variable
-export FACTORY_ADDRESS=<FACTORY_ADDRESS>
-
-# Deploy TestUniswapV3Callee
-docker exec -it sushiswap-sushiswap-v3-core-1 pnpm hardhat --network docker deploy --tags TestUniswapV3Callee
-
-# Set the returned address to a variable
-export UNISWAP_CALLEE_ADDRESS=<UNISWAP_CALLEE_ADDRESS>
-
-# Deploy NFPM contract
-docker exec -it sushiswap-sushiswap-v3-periphery-1 bash -c "export FACTORY_ADDRESS=$FACTORY_ADDRESS && yarn hardhat --network docker deploy --tags NonfungiblePositionManager"
-
-# Set the returned address to a variable
-export POSITION_MANAGER_ADDRESS=<POSITION_MANAGER_ADDRESS>
-
-# Deploy two test tokens
-docker exec -it sushiswap-sushiswap-v3-periphery-1 yarn hardhat --network docker deploy --tags TestERC20
-docker exec -it sushiswap-sushiswap-v3-periphery-1 yarn hardhat --network docker deploy --tags TestERC20
-
-# Set the returned addresses to variables
-export TOKEN0_ADDRESS=<TOKEN0_ADDRESS>
-export TOKEN1_ADDRESS=<TOKEN1_ADDRESS>
-```
-
-Watch the contracts:
-
-```bash
-# Watch factory contract
-docker exec -it sushiswap-sushi-watcher-server-1 bash -c "yarn watch:contract --address $FACTORY_ADDRESS --kind factory --startingBlock 100 --checkpoint false"
-docker exec -it sushiswap-sushi-info-watcher-server-1 bash -c "yarn watch:contract --address $FACTORY_ADDRESS --kind factory --startingBlock 100 --checkpoint false"
-
-# Watch NFPM contract
-docker exec -it sushiswap-sushi-watcher-server-1 bash -c "yarn watch:contract --address $POSITION_MANAGER_ADDRESS --kind nfpm --startingBlock 100 --checkpoint false"
-docker exec -it sushiswap-sushi-info-watcher-server-1 bash -c "yarn watch:contract --address $POSITION_MANAGER_ADDRESS --kind nfpm --startingBlock 100 --checkpoint false"
-```
-
-Run the smoke test:
-
-```bash
-docker exec -it sushiswap-sushi-watcher-server-1 bash -c "export TOKEN0_ADDRESS=$TOKEN0_ADDRESS && export TOKEN1_ADDRESS=$TOKEN1_ADDRESS && export UNISWAP_CALLEE_ADDRESS=$UNISWAP_CALLEE_ADDRESS && yarn smoke-test"
-```
-
-## sushi-info-watcher
-
-Deploy required contracts and set the addresses to variables:
-
-```bash
-# Deploy two test tokens
-docker exec -it sushiswap-sushiswap-v3-periphery-1 yarn hardhat --network docker deploy --tags TestERC20
-docker exec -it sushiswap-sushiswap-v3-periphery-1 yarn hardhat --network docker deploy --tags TestERC20
-
-# Set the returned addresses to variables
-export TOKEN0_ADDRESS=<TOKEN0_ADDRESS>
-export TOKEN1_ADDRESS=<TOKEN1_ADDRESS>
-```
-
-Run the smoke test:
-
-```bash
-docker exec -it sushiswap-sushi-info-watcher-server-1 bash -c "export TOKEN0_ADDRESS=$TOKEN0_ADDRESS && export TOKEN1_ADDRESS=$TOKEN1_ADDRESS && export UNISWAP_CALLEE_ADDRESS=$UNISWAP_CALLEE_ADDRESS && yarn smoke-test"
-```
@@ -1,22 +0,0 @@
-version: "1.0"
-name: sushiswap
-description: "End-to-end SushiSwap watcher stack"
-repos:
-  ## fixturenet-lotus repo
-  - github.com/filecoin-project/lotus
-  ## sushiswap repos
-  - github.com/cerc-io/sushiswap-v3-core@watcher-ts
-  - github.com/cerc-io/sushiswap-v3-periphery@watcher-ts
-  - github.com/vulcanize/uniswap-watcher-ts@sushiswap
-  - github.com/vulcanize/uniswap-v3-info
-containers:
-  ## fixturenet-lotus image
-  - cerc/lotus
-  ## sushiswap images
-  - cerc/sushiswap-v3-core
-  - cerc/sushiswap-v3-periphery
-  - cerc/watcher-sushiswap
-  - cerc/uniswap-v3-info
-pods:
-  - fixturenet-lotus
-  - watcher-sushiswap
@@ -1,61 +0,0 @@
-# Copyright © 2022, 2023 Cerc
-
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <http:#www.gnu.org/licenses/>.
-
-from app.util import get_yaml
-from app.deploy_types import DeployCommandContext, DeploymentContext
-from app.stack_state import State
-from app.deploy_util import VolumeMapping, run_container_command
-import os
-from pathlib import Path
-
-default_spec_file_content = """config:
-    config_variable: test-value
-"""
-
-init_help_text = """Add helpful text here on setting config variables.
-"""
-
-# Output a known string to a know file in the bind mounted directory ./container-output-dir
-# for test purposes -- test checks that the file was written.
-def setup(command_context: DeployCommandContext, extra_args):
-    host_directory = "./container-output-dir"
-    host_directory_absolute = Path(extra_args[0]).absolute().joinpath(host_directory)
-    host_directory_absolute.mkdir(parents=True, exist_ok=True)
-    mounts = [
-        VolumeMapping(host_directory_absolute, "/data")
-    ]
-    output, status = run_container_command(command_context, "test", "echo output-data > /data/output-file && echo success", mounts)
-
-
-def init(command_context: DeployCommandContext):
-    print(init_help_text)
-    yaml = get_yaml()
-    return yaml.load(default_spec_file_content)
-
-
-def create(command_context: DeployCommandContext):
-    data = "create-command-output-data"
-    output_file_path = command_context.deployment_dir.joinpath("create-file")
-    with open(output_file_path, 'w+') as output_file:
-        output_file.write(data)
-
-
-def get_state(command_context: DeployCommandContext):
-    print("Here we get state")
-    return State.CONFIGURED
-
-
-def change_state(command_context: DeployCommandContext):
-    pass
@@ -22,13 +22,13 @@ Instructions to deploy Uniswap v3 watcher stack (watcher + uniswap-v3-info front
 * Clone / pull required repositories:

  ```bash
-  $ laconic-so setup-repositories --include vulcanize/uniswap-watcher-ts,vulcanize/uniswap-v3-info --git-ssh --pull
+  $ laconic-so --stack uniswap-v3 setup-repositories
  ```

 * Build watcher and info app container images:

  ```bash
-  $ laconic-so build-containers --include cerc/watcher-uniswap-v3,cerc/uniswap-v3-info
+  $ laconic-so --stack uniswap-v3 build-containers
  ```

  This should create the required docker images in the local image registry.
@@ -3,8 +3,14 @@ name: uniswap-v3
 repos:
  - github.com/vulcanize/uniswap-watcher-ts
  - github.com/vulcanize/uniswap-v3-info
+  - github.com/cerc-io/ipld-eth-db
+  - github.com/cerc-io/ipld-eth-server
 containers:
  - cerc/watcher-uniswap-v3
  - cerc/uniswap-v3-info
+  - cerc/ipld-eth-db
+  - cerc/ipld-eth-server
 pods:
  - watcher-uniswap-v3
+  - ipld-eth-db
+  - ipld-eth-server
@@ -27,12 +27,17 @@ from python_on_whales import DockerClient, DockerException
 import click
 from pathlib import Path
 from app.util import include_exclude_check, get_parsed_stack_config, global_options2
-from app.deploy_types import ClusterContext, DeployCommandContext
 from app.deployment_create import create as deployment_create
 from app.deployment_create import init as deployment_init
 from app.deployment_create import setup as deployment_setup


+class DeployCommandContext(object):
+    def __init__(self, cluster_context, docker):
+        self.cluster_context = cluster_context
+        self.docker = docker
+
+
@click.group()
@click.option("--include", help="only start these components")
@click.option("--exclude", help="don\'t start these components")
@@ -53,7 +58,7 @@ def create_deploy_context(global_context, stack, include, exclude, cluster, env_
    # 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,
                          compose_env_file=cluster_context.env_file)
-    return DeployCommandContext(stack, cluster_context, docker)
+    return DeployCommandContext(cluster_context, docker)


 def up_operation(ctx, services_list, stay_attached=False):
@@ -144,16 +149,14 @@ def exec_operation(ctx, extra_args):
            print(f"container command returned error exit status")


-def logs_operation(ctx, tail: int, follow: bool, extra_args: str):
+def logs_operation(ctx, 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 logs")
-        services_list = extra_args_list if extra_args_list is not None else []
-        logs_stream = ctx.obj.docker.compose.logs(services=services_list, tail=tail, follow=follow, stream=True)
-        for stream_type, stream_content in logs_stream:
-            print(stream_content.decode("utf-8"), end="")
+        logs_output = ctx.obj.docker.compose.logs(services=extra_args_list if extra_args_list is not None else [])
+        print(logs_output)


@command.command()
@@ -194,12 +197,10 @@ def exec(ctx, extra_args):


@command.command()
-@click.option("--tail", "-n", default=None, help="number of lines to display")
-@click.option("--follow", "-f", is_flag=True, default=False, help="follow log output")
@click.argument('extra_args', nargs=-1)  # help: command: logs <service1> <service2>
@click.pass_context
-def logs(ctx, tail, follow, extra_args):
-    logs_operation(ctx, tail, follow, extra_args)
+def logs(ctx, extra_args):
+    logs_operation(ctx, extra_args)


 def get_stack_status(ctx, stack):
@@ -312,7 +313,17 @@ def _make_cluster_context(ctx, stack, include, exclude, cluster, env_file):
    if ctx.verbose:
        print(f"files: {compose_files}")

-    return ClusterContext(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, env_file)
+
+
+class cluster_context:
+    def __init__(self, cluster, compose_files, pre_start_commands, post_start_commands, config, env_file) -> 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):
@@ -1,47 +0,0 @@
-# Copyright © 2023 Cerc
-
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <http:#www.gnu.org/licenses/>.
-
-from typing import List
-from dataclasses import dataclass
-from pathlib import Path
-from python_on_whales import DockerClient
-
-@dataclass
-class ClusterContext:
-    cluster: str
-    compose_files: List[str]
-    pre_start_commands: List[str]
-    post_start_commands: List[str]
-    config: str
-    env_file: str
-
-
-@dataclass
-class DeployCommandContext:
-    stack: str
-    cluster_context: ClusterContext
-    docker: DockerClient
-
-
-@dataclass
-class DeploymentContext:
-    deployment_dir: Path
-    command_context: DeployCommandContext
-
-
-@dataclass
-class VolumeMapping:
-    host_path: str
-    container_path: str
@@ -1,56 +0,0 @@
-# Copyright © 2022, 2023 Cerc
-
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <http:#www.gnu.org/licenses/>.
-
-import os
-from typing import List
-from dataclasses import dataclass
-from app.deploy_types import DeployCommandContext, VolumeMapping
-from app.util import get_parsed_stack_config, get_yaml, get_compose_file_dir
-
-
-def _container_image_from_service(stack:str, service: str):
-    # Parse the compose files looking for the image name of the specified service
-    image_name = None
-    parsed_stack = get_parsed_stack_config(stack)
-    pods = parsed_stack["pods"]
-    yaml = get_yaml()
-    for pod in pods:
-        pod_file_path = os.path.join(get_compose_file_dir(), f"docker-compose-{pod}.yml")
-        parsed_pod_file = yaml.load(open(pod_file_path, "r"))
-        if "services" in parsed_pod_file:
-            services = parsed_pod_file["services"]
-            if service in services:
-                service_definition = services[service]
-                if "image" in service_definition:
-                    image_name = service_definition["image"]
-    return image_name
-
-
-def _volumes_to_docker(mounts: List[VolumeMapping]):
-# Example from doc: [("/", "/host"), ("/etc/hosts", "/etc/hosts", "rw")]
-    result = []
-    for mount in mounts:
-        docker_volume = (mount.host_path, mount.container_path)
-        result.append(docker_volume)
-    return result
-
-
-def run_container_command(ctx: DeployCommandContext, service: str, command: str, mounts: List[VolumeMapping]):
-    docker = ctx.docker
-    container_image = _container_image_from_service(ctx.stack, service)
-    docker_volumes = _volumes_to_docker(mounts)
-    docker_output = docker.run(container_image, ["-c", command], entrypoint="bash", volumes=docker_volumes)
-    # There doesn't seem to be a way to get an exit code from docker.run()
-    return (docker_output, 0)
@@ -119,13 +119,11 @@ def exec(ctx, extra_args):


@command.command()
-@click.option("--tail", "-n", default=None, help="number of lines to display")
-@click.option("--follow", "-f", is_flag=True, default=False, help="follow log output")
@click.argument('extra_args', nargs=-1)  # help: command: logs <service1> <service2>
@click.pass_context
-def logs(ctx, tail, follow, extra_args):
+def logs(ctx, extra_args):
    ctx.obj = make_deploy_context(ctx)
-    logs_operation(ctx, tail, follow, extra_args)
+    logs_operation(ctx, extra_args)


@command.command()
@@ -20,27 +20,25 @@ import os
 from pathlib import Path
 from shutil import copyfile, copytree
 import sys
-from app.util import get_stack_file_path, get_parsed_deployment_spec, get_parsed_stack_config, global_options, get_yaml, get_compose_file_dir
-from app.deploy_types import DeploymentContext, DeployCommandContext
+from app.util import get_stack_file_path, get_parsed_deployment_spec, get_parsed_stack_config, global_options, get_yaml
+
+@dataclass
+class DeploymentContext:
+    stack: str
+    deployment_dir: Path


 def _make_default_deployment_dir():
    return "deployment-001"

-def _get_ports(stack):
-    ports = {}
-    parsed_stack = get_parsed_stack_config(stack)
-    pods = parsed_stack["pods"]
-    yaml = get_yaml()
-    for pod in pods:
-        pod_file_path = os.path.join(get_compose_file_dir(), f"docker-compose-{pod}.yml")
-        parsed_pod_file = yaml.load(open(pod_file_path, "r"))
-        if "services" in parsed_pod_file:
-            for svc_name, svc in parsed_pod_file["services"].items():
-                if "ports" in svc:
-                    # Ports can appear as strings or numbers.  We normalize them as strings.
-                    ports[svc_name] = [ str(x) for x in svc["ports"] ]
-    return ports
+
+def _get_compose_file_dir():
+    # TODO: refactor to use common code with deploy command
+    # See: https://stackoverflow.com/questions/25389095/python-get-path-of-root-project-structure
+    data_dir = Path(__file__).absolute().parent.joinpath("data")
+    source_compose_dir = data_dir.joinpath("compose")
+    return source_compose_dir
+

 def _get_named_volumes(stack):
    # Parse the compose files looking for named volumes
@@ -49,7 +47,7 @@ def _get_named_volumes(stack):
    pods = parsed_stack["pods"]
    yaml = get_yaml()
    for pod in pods:
-        pod_file_path = os.path.join(get_compose_file_dir(), f"docker-compose-{pod}.yml")
+        pod_file_path = os.path.join(_get_compose_file_dir(), f"docker-compose-{pod}.yml")
        parsed_pod_file = yaml.load(open(pod_file_path, "r"))
        if "volumes" in parsed_pod_file:
            volumes = parsed_pod_file["volumes"]
@@ -76,53 +74,47 @@ def _create_bind_dir_if_relative(volume, path_string, compose_dir):

 # See: https://stackoverflow.com/questions/45699189/editing-docker-compose-yml-with-pyyaml
 def _fixup_pod_file(pod, spec, compose_dir):
-   # Fix up volumes
-   if "volumes" in spec:
-       spec_volumes = spec["volumes"]
-       if "volumes" in pod:
-           pod_volumes = pod["volumes"]
-           for volume in pod_volumes.keys():
-               if volume in spec_volumes:
-                   volume_spec = spec_volumes[volume]
-                   volume_spec_fixedup = volume_spec if Path(volume_spec).is_absolute() else f".{volume_spec}"
-                   _create_bind_dir_if_relative(volume, volume_spec, compose_dir)
-                   new_volume_spec = {"driver": "local",
-                                      "driver_opts": {
-                                          "type": "none",
-                                          "device": volume_spec_fixedup,
-                                          "o": "bind"
+    # Fix up volumes
+    if "volumes" in spec:
+        spec_volumes = spec["volumes"]
+        if "volumes" in pod:
+            pod_volumes = pod["volumes"]
+            for volume in pod_volumes.keys():
+                if volume in spec_volumes:
+                    volume_spec = spec_volumes[volume]
+                    volume_spec_fixedup = volume_spec if Path(volume_spec).is_absolute() else f".{volume_spec}"
+                    _create_bind_dir_if_relative(volume, volume_spec, compose_dir)
+                    new_volume_spec = {"driver": "local",
+                                       "driver_opts": {
+                                           "type": "none",
+                                           "device": volume_spec_fixedup,
+                                           "o": "bind"
+                                        }
                                       }
-                                      }
-                   pod["volumes"][volume] = new_volume_spec
-   # Fix up ports
-   if "ports" in spec:
-       spec_ports = spec["ports"]
-       for container_name, container_ports in spec_ports.items():
-           if container_name in pod["services"]:
-               pod["services"][container_name]["ports"] = container_ports
+                    pod["volumes"][volume] = new_volume_spec


-def call_stack_deploy_init(deploy_command_context):
+def call_stack_deploy_init(stack):
    # Link with the python file in the stack
    # Call a function in it
    # If no function found, return None
-    python_file_path = get_stack_file_path(deploy_command_context.stack).parent.joinpath("deploy", "commands.py")
+    python_file_path = get_stack_file_path(stack).parent.joinpath("deploy", "commands.py")
    spec = util.spec_from_file_location("commands", python_file_path)
    imported_stack = util.module_from_spec(spec)
    spec.loader.exec_module(imported_stack)
-    return imported_stack.init(deploy_command_context)
+    return imported_stack.init(None)


 # TODO: fold this with function above
-def call_stack_deploy_setup(deploy_command_context, extra_args):
+def call_stack_deploy_setup(stack):
    # Link with the python file in the stack
    # Call a function in it
    # If no function found, return None
-    python_file_path = get_stack_file_path(deploy_command_context.stack).parent.joinpath("deploy", "commands.py")
+    python_file_path = get_stack_file_path(stack).parent.joinpath("deploy", "commands.py")
    spec = util.spec_from_file_location("commands", python_file_path)
    imported_stack = util.module_from_spec(spec)
    spec.loader.exec_module(imported_stack)
-    return imported_stack.setup(deploy_command_context, extra_args)
+    return imported_stack.setup(None)


 # TODO: fold this with function above
@@ -130,7 +122,7 @@ def call_stack_deploy_create(deployment_context):
    # Link with the python file in the stack
    # Call a function in it
    # If no function found, return None
-    python_file_path = get_stack_file_path(deployment_context.command_context.stack).parent.joinpath("deploy", "commands.py")
+    python_file_path = get_stack_file_path(deployment_context.stack).parent.joinpath("deploy", "commands.py")
    spec = util.spec_from_file_location("commands", python_file_path)
    imported_stack = util.module_from_spec(spec)
    spec.loader.exec_module(imported_stack)
@@ -162,24 +154,18 @@ def init(ctx, output):
    yaml = get_yaml()
    stack = global_options(ctx).stack
    verbose = global_options(ctx).verbose
-    default_spec_file_content = call_stack_deploy_init(ctx.obj)
+    default_spec_file_content = call_stack_deploy_init(stack)
    spec_file_content = {"stack": stack}
    if default_spec_file_content:
        spec_file_content.update(default_spec_file_content)
    if verbose:
        print(f"Creating spec file for stack: {stack}")
-
-    ports = _get_ports(stack)
-    if ports:
-        spec_file_content["ports"] = ports
-
    named_volumes = _get_named_volumes(stack)
    if named_volumes:
        volume_descriptors = {}
        for named_volume in named_volumes:
            volume_descriptors[named_volume] = f"./data/{named_volume}"
        spec_file_content["volumes"] = volume_descriptors
-
    with open(output, "w") as output_file:
        yaml.dump(spec_file_content, output_file)

@@ -212,7 +198,7 @@ def create(ctx, spec_file, deployment_dir):
    data_dir = Path(__file__).absolute().parent.joinpath("data")
    yaml = get_yaml()
    for pod in pods:
-        pod_file_path = os.path.join(get_compose_file_dir(), f"docker-compose-{pod}.yml")
+        pod_file_path = os.path.join(_get_compose_file_dir(), f"docker-compose-{pod}.yml")
        parsed_pod_file = yaml.load(open(pod_file_path, "r"))
        extra_config_dirs = _find_extra_config_dirs(parsed_pod_file, pod)
        if global_options(ctx).debug:
@@ -231,11 +217,7 @@ def create(ctx, spec_file, deployment_dir):
                if not os.path.exists(destination_config_dir):
                    copytree(source_config_dir, destination_config_dir)
    # Delegate to the stack's Python code
-    # The deploy create command doesn't require a --stack argument so we need to insert the
-    # stack member here.
-    deployment_command_context = ctx.obj
-    deployment_command_context.stack = stack_name
-    deployment_context = DeploymentContext(Path(deployment_dir), deployment_command_context)
+    deployment_context = DeploymentContext(stack_name, Path(deployment_dir))
    call_stack_deploy_create(deployment_context)


@@ -245,7 +227,7 @@ def create(ctx, spec_file, deployment_dir):
@click.option("--initialize-network", is_flag=True, default=False, help="Help goes here")
@click.option("--join-network", is_flag=True, default=False, help="Help goes here")
@click.option("--create-network", is_flag=True, default=False, help="Help goes here")
-@click.argument('extra_args', nargs=-1)
@click.pass_context
-def setup(ctx, node_moniker, key_name, initialize_network, join_network, create_network, extra_args):
-    call_stack_deploy_setup(ctx.obj, extra_args)
+def setup(ctx, node_moniker, key_name, initialize_network, join_network, create_network):
+    stack = global_options(ctx).stack
+    call_stack_deploy_setup(stack)
@@ -56,14 +56,6 @@ def get_parsed_stack_config(stack):
        sys.exit(1)


-def get_compose_file_dir():
-    # TODO: refactor to use common code with deploy command
-    # See: https://stackoverflow.com/questions/25389095/python-get-path-of-root-project-structure
-    data_dir = Path(__file__).absolute().parent.joinpath("data")
-    source_compose_dir = data_dir.joinpath("compose")
-    return source_compose_dir
-
-
 def get_parsed_deployment_spec(spec_file):
    spec_file_path = Path(spec_file)
    try:
@@ -52,7 +52,7 @@ laconic-so version
 1. Get the repositories

 ```
-laconic-so --stack fixturenet-laconic-loaded setup-repositories --include github.com/cerc-io/laconicd,github.com/cerc-io/laconic-sdk,github.com/cerc-io/laconic-registry-cli,github.com/cerc-io/laconic-console
+laconic-so --stack fixturenet-laconic-loaded setup-repositories --include cerc-io/laconicd,cerc-io/laconic-sdk,cerc-io/laconic-registry-cli,cerc-io/laconic-console
 ```

 2. Set this environment variable to the Laconic self-hosted Gitea instance:
@@ -108,37 +108,6 @@ laconic-5cd0a80c1442c3044c8b295d26426bae-laconicd-1         | 9:30PM INF indexed
 laconic-so --stack fixturenet-laconic-loaded deploy exec cli "laconic cns status"
 ```

-```
-{
-  "version": "0.3.0",
-  "node": {
-    "id": "4216af2ac9f68bda33a38803fc1b5c9559312c1d",
-    "network": "laconic_9000-1",
-    "moniker": "localtestnet"
-  },
-  "sync": {
-    "latest_block_hash": "1BDF4CB9AE2390DA65BCF997C83133C18014FCDDCAE03708488F0B56FCEEA429",
-    "latest_block_height": "5",
-    "latest_block_time": "2023-08-09 16:00:30.386903172 +0000 UTC",
-    "catching_up": false
-  },
-  "validator": {
-    "address": "651FBC700B747C76E90ACFC18CC9508C3D0905B9",
-    "voting_power": "1000000000000000"
-  },
-  "validators": [
-    {
-      "address": "651FBC700B747C76E90ACFC18CC9508C3D0905B9",
-      "voting_power": "1000000000000000",
-      "proposer_priority": "0"
-    }
-  ],
-  "num_peers": "0",
-  "peers": [],
-  "disk_usage": "292.0K"
-}
-```
-
 ## Configure Digital Ocean firewall

 Let's open some ports.
@@ -1,8 +1,7 @@
-python-decouple>=3.8
-GitPython>=3.1.32
-tqdm>=4.65.0
-python-on-whales>=0.64.0
-click>=8.1.6
-PyYAML>=6.0.1
+python-decouple>=3.6
+GitPython>=3.1.27
+tqdm>=4.64.0
+python-on-whales>=0.58.0
+click>=8.1.3
+pyyaml>=6.0
 ruamel.yaml>=0.17.32
-pydantic==1.10.9
@@ -23,27 +23,6 @@ mkdir -p $CERC_REPO_BASE_DIR
 # with and without volume removal
 $TEST_TARGET_SO --stack test setup-repositories
 $TEST_TARGET_SO --stack test build-containers
-# Test deploy command execution
-$TEST_TARGET_SO --stack test deploy setup $CERC_REPO_BASE_DIR
-# Check that we now have the expected output directory
-container_output_dir=$CERC_REPO_BASE_DIR/container-output-dir
-if [ ! -d "$container_output_dir" ]; then
-    echo "deploy setup test: output directory not present"
-    echo "deploy setup test: FAILED"
-    exit 1
-fi
-if [ ! -f "$container_output_dir/output-file" ]; then
-    echo "deploy setup test: output file not present"
-    echo "deploy setup test: FAILED"
-    exit 1
-fi
-output_file_content=$(<$container_output_dir/output-file)
-if [ ! "$output_file_content" == "output-data"  ]; then
-    echo "deploy setup test: output file contents not correct"
-    echo "deploy setup test: FAILED"
-    exit 1
-fi
-# Check that we now have the expected output file
 $TEST_TARGET_SO --stack test deploy up
 # Test deploy port command
 deploy_port_output=$( $TEST_TARGET_SO --stack test deploy port test 80 )
@@ -74,49 +53,4 @@ else
    exit 1
 fi
 $TEST_TARGET_SO --stack test deploy down --delete-volumes
-# Basic test of creating a deployment
-test_deployment_dir=$CERC_REPO_BASE_DIR/test-deployment-dir
-test_deployment_spec=$CERC_REPO_BASE_DIR/test-deployment-spec.yml
-$TEST_TARGET_SO --stack test deploy init --output $test_deployment_spec
-# Check the file now exists
-if [ ! -f "$test_deployment_spec" ]; then
-    echo "deploy init test: spec file not present"
-    echo "deploy init test: FAILED"
-    exit 1
-fi
-echo "deploy init test: passed"
-$TEST_TARGET_SO deploy create --spec-file $test_deployment_spec --deployment-dir $test_deployment_dir
-# Check the deployment dir exists
-if [ ! -d "$test_deployment_dir" ]; then
-    echo "deploy create test: deployment directory not present"
-    echo "deploy create test: FAILED"
-    exit 1
-fi
-echo "deploy create test: passed"
-# Check the file writted by the create command in the stack now exists
-if [ ! -f "$test_deployment_dir/create-file" ]; then
-    echo "deploy create test: create output file not present"
-    echo "deploy create test: FAILED"
-    exit 1
-fi
-# And has the right content
-create_file_content=$(<$test_deployment_dir/create-file)
-if [ ! "$create_file_content" == "create-command-output-data"  ]; then
-    echo "deploy create test: create output file contents not correct"
-    echo "deploy create test: FAILED"
-    exit 1
-fi
-echo "deploy create output file test: passed"
-# Try to start the deployment
-$TEST_TARGET_SO deployment --dir $test_deployment_dir start
-# Check logs command works
-log_output_2=$( $TEST_TARGET_SO deployment --dir $test_deployment_dir logs )
-if [[ "$log_output_2" == *"Filesystem is fresh"* ]]; then
-    echo "deployment logs test: passed"
-else
-    echo "deployment logs test: FAILED"
-    exit 1
-fi
-# Stop and clean up
-$TEST_TARGET_SO deployment --dir $test_deployment_dir stop --delete-volumes
 echo "Test passed"
Author	SHA1	Message	Date
Your Name	8684f64eb6	ports etc	2023-07-27 00:53:02 +00:00
zramsay	525d7ee49b	uniswap updates	2023-07-26 19:44:59 -04:00
				`@@ -0,0 +1 @@`
				`}+V�{iνΆΠΉ�²�¨ΣΗ\k»qς␍—?δΪAΒfκ’~μ©™LΉ�tb·yqτ·²ηξΔ�Ο?ξaΣ�J`
				`@@ -0,0 +1 @@`
				`Βfκ’~μ©™LΉ�tb·yqτ·²ηξΔ�Ο?ξaΣ�J`
				`@@ -0,0 +1 @@`
				`7b2254797065223a22626c73222c22507269766174654b6579223a227446765352695367324733537367673050535979323358796a61494d5870736d64794732423755464c54343d227d`