Merge pull request #4 from dipdup-io/8.3-update

Author: droserasprout

Makefile

@@ -1,3 +1,4 @@
+# generated by DipDup 8.3.2
 .PHONY: $(MAKECMDGOALS)
 MAKEFLAGS += --no-print-directory
 ##
@@ -11,34 +12,22 @@ help:           ## Show this help (default)
 	@grep -Fh "##" $(MAKEFILE_LIST) | grep -Fv grep -F | sed -e 's/\\$$//' | sed -e 's/##//'
 
 all:            ## Run an entire CI pipeline
-	make format lint
+	make install format lint
 
 ##
 
 install:        ## Install dependencies
-	poetry install
-
+	uv sync --all-extras --all-groups --link-mode symlink --locked
 
 update:         ## Update dependencies
-	poetry update
 	dipdup self update -q
+	uv sync --all-extras --all-groups --link-mode symlink -U
 
+format:         ## Format code with ruff
+	ruff format .
 
-format:         ## Format with all tools
-	make black
-
-lint:           ## Lint with all tools
-	make ruff mypy
-
-##
-
-black:          ## Format with black
-	black .
-
-ruff:           ## Lint with ruff
+lint:           ## Lint code with ruff and mypy
 	ruff check --fix .
-
-mypy:           ## Lint with mypy
 	mypy .
 
 ##

README.md

@@ -6,10 +6,10 @@ A blockchain indexer built with DipDup
 
 This project is based on [DipDup](https://dipdup.io), a framework for building featureful dapps.
 
-You need a Linux/macOS system with Python 3.12 installed. To install DipDup with pipx or use our installer:
+You need a Linux/macOS system with Python 3.12 installed. To install DipDup use `uv tool` or our installer script:
 
 ```shell
-curl -Lsf https://dipdup.io/install.py | python3.12
+curl -Lsf https://dipdup.io/install.py | python3
 ```
 
 See the [Installation](https://dipdup.io/docs/installation) page for all options.
@@ -22,28 +22,27 @@ Run the indexer in memory:
 dipdup run
 ```
 
-Store data in SQLite database:
+Store data in SQLite database (defaults to /tmp, set `SQLITE_PATH` env variable):
 
 ```shell
-dipdup -c . -c configs/dipdup.sqlite.yaml run
+dipdup -C sqlite run
 ```
 
 Or spawn a Compose stack with PostgreSQL and Hasura:
 
 ```shell
-cd deploy
-cp .env.default .env
+cp deploy/.env.default deploy/.env
 # Edit .env file before running
-docker-compose up
+make up
 ```
 
 ## Development setup
 
 To set up the development environment:
 
 ```shell
-poetry install
-poetry shell
+make install
+source .venv/bin/activate
 ```
 
 Run `make all` to run full CI check or `make help` to see other available commands.

configs/dipdup.compose.yaml

@@ -3,22 +3,29 @@ database:
   host: ${POSTGRES_HOST:-db}
   port: 5432
   user: ${POSTGRES_USER:-dipdup}
-  password: ${POSTGRES_PASSWORD}
+  password: ${POSTGRES_PASSWORD:-changeme}
   database: ${POSTGRES_DB:-dipdup}
 
 hasura:
   url: http://${HASURA_HOST:-hasura}:8080
-  admin_secret: ${HASURA_SECRET}
+  admin_secret: ${HASURA_SECRET:-changeme}
   allow_aggregations: ${HASURA_ALLOW_AGGREGATIONS:-true}
   select_limit: ${HASURA_SELECT_LIMIT:-10000}
-  camel_case: false
+  camel_case: ${HASURA_CAMEL_CASE:-true}
 
 sentry:
   dsn: ${SENTRY_DSN:-''}
   environment: ${SENTRY_ENVIRONMENT:-''}
 
 prometheus:
   host: 0.0.0.0
+  port: 8000
 
 api:
-  host: 0.0.0.0
+  host: 0.0.0.0
+  port: 46339
+
+mcp:
+  host: 0.0.0.0
+  port: 9999
+  api_url: http://dipdup:46339

configs/dipdup.sqlite.yaml

@@ -1,3 +1,20 @@
 database:
   kind: sqlite
-  path: ${SQLITE_PATH:-/tmp/manutd_indexer.sqlite}
+  path: ${SQLITE_PATH:-/tmp/manutd_indexer.sqlite}
+
+sentry:
+  dsn: ${SENTRY_DSN:-''}
+  environment: ${SENTRY_ENVIRONMENT:-''}
+
+prometheus:
+  host: 0.0.0.0
+  port: 8000
+
+api:
+  host: 0.0.0.0
+  port: 46339
+
+mcp:
+  host: 0.0.0.0
+  port: 9999
+  api_url: http://0.0.0.0:46339

configs/dipdup.swarm.yaml

@@ -1,24 +1,31 @@
 database:
   kind: postgres
-  host: ${POSTGRES_HOST:-db}
+  host: ${POSTGRES_HOST:-manutd_indexer_db}
   port: 5432
   user: ${POSTGRES_USER:-dipdup}
-  password: ${POSTGRES_PASSWORD}
+  password: ${POSTGRES_PASSWORD:-changeme}
   database: ${POSTGRES_DB:-dipdup}
 
 hasura:
-  url: http://${HASURA_HOST:-hasura}:8080
-  admin_secret: ${HASURA_SECRET}
+  url: http://${HASURA_HOST:-manutd_indexer_hasura}:8080
+  admin_secret: ${HASURA_SECRET:-changeme}
   allow_aggregations: ${HASURA_ALLOW_AGGREGATIONS:-false}
   select_limit: ${HASURA_SELECT_LIMIT:-100}
-  camel_case: false
+  camel_case: ${HASURA_CAMEL_CASE:-true}
 
 sentry:
   dsn: ${SENTRY_DSN:-''}
   environment: ${SENTRY_ENVIRONMENT:-''}
 
 prometheus:
   host: 0.0.0.0
+  port: 8000
 
 api:
-  host: 0.0.0.0
+  host: 0.0.0.0
+  port: 46339
+
+mcp:
+  host: 0.0.0.0
+  port: 9999
+  api_url: http://dipdup:46339

configs/replay.yaml

@@ -15,4 +15,4 @@ replay:
   postgres_data_path: /home/postgres/pgdata/data
   hasura_image: hasura/graphql-engine:latest
   line_length: 140
-  package_manager: poetry
+  package_manager: uv

deploy/.env.default

@@ -4,13 +4,13 @@
 CONTRACT_GHOSTNET=
 CONTRACT_MAINNET=
 HASURA_ALLOW_AGGREGATIONS=true
-HASURA_CAMEL_CASE=false
+HASURA_CAMEL_CASE=true
 HASURA_HOST=hasura
-HASURA_SECRET=
+HASURA_SECRET=changeme
 HASURA_SELECT_LIMIT=10000
 POSTGRES_DB=dipdup
 POSTGRES_HOST=db
-POSTGRES_PASSWORD=
+POSTGRES_PASSWORD=changeme
 POSTGRES_USER=dipdup
 SENTRY_DSN=''
 SENTRY_ENVIRONMENT=''

deploy/Dockerfile

@@ -1,6 +1,6 @@
-# FROM dipdup/dipdup:8
+FROM dipdup/dipdup:8
 # FROM ghcr.io/dipdup-io/dipdup:8
-FROM ghcr.io/dipdup-io/dipdup:aux-8.0.0
+# FROM ghcr.io/dipdup-io/dipdup:next
 
 # COPY --chown=dipdup pyproject.toml README.md .
 # RUN pip install .

deploy/compose.mcp.yaml

@@ -0,0 +1,67 @@
+name: manutd_indexer
+
+services:
+  dipdup:
+    build:
+      context: ..
+      dockerfile: deploy/Dockerfile
+    restart: always
+    env_file: .env
+    ports:
+      - 46339
+      - 9000
+    command: ["-C", "compose", "run"]
+    depends_on:
+      - db
+      - hasura
+
+  db:
+    image: timescale/timescaledb-ha:pg15
+    ports:
+      - "${POSTGRES_HOST_PORT:-5432}:5432"
+    volumes:
+      - db:/home/postgres/pgdata/data
+    restart: always
+    env_file: .env
+    environment:
+      - POSTGRES_USER=dipdup
+      - POSTGRES_DB=dipdup
+      - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U dipdup"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
+
+  hasura:
+    image: hasura/graphql-engine:latest
+    ports:
+      - "${HASURA_HOST_PORT:-8080}:8080"
+    depends_on:
+      - db
+    restart: always
+    environment:
+      - HASURA_GRAPHQL_DATABASE_URL=postgres://dipdup:${POSTGRES_PASSWORD}@db:5432/dipdup
+      - HASURA_GRAPHQL_ADMIN_SECRET=${HASURA_SECRET}
+      - HASURA_GRAPHQL_ENABLE_CONSOLE=true
+      - HASURA_GRAPHQL_DEV_MODE=true
+      - HASURA_GRAPHQL_LOG_LEVEL=info
+      - HASURA_GRAPHQL_ENABLE_TELEMETRY=false
+      - HASURA_GRAPHQL_UNAUTHORIZED_ROLE=user
+      - HASURA_GRAPHQL_STRINGIFY_NUMERIC_TYPES=true
+
+  mcp:
+    build:
+      context: ..
+      dockerfile: deploy/Dockerfile
+    restart: always
+    env_file: .env
+    ports:
+      - 9999
+    command: ["-C", "compose", "mcp", "run"]
+    depends_on:
+      - db
+      - hasura
+
+volumes:
+  db:

deploy/compose.sqlite.yaml

@@ -5,7 +5,7 @@ services:
     build:
       context: ..
       dockerfile: deploy/Dockerfile
-    command: ["-c", "dipdup.yaml", "-c", "configs/dipdup.sqlite.yaml", "run"]
+    command: ["-C", "sqlite", "run"]
     restart: always
     env_file: .env
     ports: