Explicit env vars, fix integer overflows (#23)

Co-authored-by: Lev Gorodetskiy <[email protected]>

Author: m-kus

.dockerignore

@@ -9,4 +9,6 @@ scripts
 tests
 *.ipynb
 *.json
-*.zip
+*.zip
+docker-compose.yml
+Dockerfile

Dockerfile

@@ -23,4 +23,5 @@ USER dipdup
 
 WORKDIR /home/dipdup/
 EXPOSE 8888
-ENTRYPOINT [ "python", "-m", "dipdup"]
+ENTRYPOINT ["python", "-m", "dipdup"]
+CMD ["-c", "dipdup.yml", "run"]

README.md

@@ -178,9 +178,8 @@ Use `docker-compose.yml` included in this repo if you prefer to run dipdup in Do
 
 ```shell
 $ docker-compose build
-$ cp secrets.env.example secrets.env
-$ # edit `secrets.env` file, change credentials
-$ docker-compose up dipdup
+$ # example target, edit volumes section to change dipdup config
+$ docker-compose up hic_et_nunc
 ```
 
 For debugging purposes you can index specific block range only and skip realtime indexing. To do this set `first_block` and `last_block` fields in index config.

docker-compose.yml

@@ -1,27 +1,48 @@
 version: "3.8"
 
-x-dipdup: &x-dipdup
-  build: .
-  depends_on:
-    - db
-  volumes:
-    - ./src/demo_hic_et_nunc/dipdup-docker.yml:/home/dipdup/dipdup.yml
-  env_file: secrets.env
-
 services:
-  dipdup:
-    <<: *x-dipdup
+  hic_et_nunc:
+    build: .
+    depends_on:
+      - db
+    volumes:
+      - ./src/demo_hic_et_nunc/dipdup-docker.yml:/home/dipdup/dipdup.yml
     restart: always
-    command: ["-c", "dipdup.yml", "run"]
+    environment:
+      - POSTGRES_PASSWORD=${POSTGRES_PASSWORD:-changeme}
+      - ADMIN_SECRET=${ADMIN_SECRET:-changeme}
+
+  # quipuswap:
+  #   build: .
+  #   depends_on:
+  #     - db
+  #   volumes:
+  #     - ./src/demo_quipuswap/dipdup-docker.yml:/home/dipdup/dipdup.yml
+  #   restart: always
+  #   environment:
+  #     - POSTGRES_PASSWORD=${POSTGRES_PASSWORD:-changeme}
+  #     - ADMIN_SECRET=${ADMIN_SECRET:-changeme}
+
+  tzcolors:
+    build: .
     depends_on:
       - db
+    volumes:
+      - ./src/demo_tzcolors/dipdup-docker.yml:/home/dipdup/dipdup.yml
+    restart: always
+    environment:
+      - POSTGRES_PASSWORD=${POSTGRES_PASSWORD:-changeme}
+      - ADMIN_SECRET=${ADMIN_SECRET:-changeme}
 
   db:
     image: postgres
     restart: always
     volumes:
       - db:/var/lib/postgres/data
-    env_file: secrets.env
+    environment: 
+      - POSTGRES_USER=dipdup
+      - POSTGRES_DB=dipdup
+      - POSTGRES_PASSWORD=${POSTGRES_PASSWORD:-changeme}
     healthcheck:
       test: ["CMD-SHELL", "pg_isready -U postgres"]
       interval: 10s
@@ -31,11 +52,16 @@ services:
   hasura:
     image: hasura/graphql-engine:v1.3.3
     ports:
-    - 8080:8080
+      - 127.0.0.1:8080:8080
     depends_on:
-    - db
+      - db
     restart: always
-    env_file: secrets.env
+    environment:
+      - HASURA_GRAPHQL_DATABASE_URL=postgres://dipdup:${POSTGRES_PASSWORD:-changeme}@db:5432/dipdup
+      - HASURA_GRAPHQL_ENABLE_CONSOLE=true
+      - HASURA_GRAPHQL_DEV_MODE=true
+      - HASURA_GRAPHQL_ENABLED_LOG_TYPES=startup, http-log, webhook-log, websocket-log, query-log
+      - HASURA_GRAPHQL_ADMIN_SECRET=${ADMIN_SECRET:-changeme}
 
 volumes:
   db:

secrets.env.example

@@ -5,14 +5,14 @@ database:
   kind: postgres
   host: db
   port: 5432
-  user: dipdup
-  password: changeme
-  database: dipdup
+  user: ${POSTGRES_USER:-dipdup}
+  password: ${POSTGRES_PASSWORD:-changeme}
+  database: ${POSTGRES_DB:-dipdup}
   schema_name: hic_et_nunc
 
 hasura:
   url: http://hasura:8080
-  admin_secret: changeme
+  admin_secret: ${ADMIN_SECRET:-changeme}
 
 contracts:
   HEN_objkts: 

src/demo_hic_et_nunc/dipdup-docker.yml

@@ -19,17 +19,17 @@ class Holder(Model):
 class Token(Model):
     id = fields.BigIntField(pk=True)
     creator = fields.ForeignKeyField('models.Holder', 'tokens')
-    supply = fields.IntField()
+    supply = fields.BigIntField()
     level = fields.BigIntField()
     timestamp = fields.DatetimeField()
 
 
 class Swap(Model):
     id = fields.BigIntField(pk=True)
     creator = fields.ForeignKeyField('models.Holder', 'swaps')
-    price = fields.IntField()
-    amount = fields.IntField()
-    amount_left = fields.IntField()
+    price = fields.BigIntField()
+    amount = fields.BigIntField()
+    amount_left = fields.BigIntField()
     level = fields.BigIntField()
     status = fields.IntEnumField(SwapStatus)
     timestamp = fields.DatetimeField()

src/demo_hic_et_nunc/models.py

@@ -16,10 +16,10 @@ class Meta:
 
 
 class Token(Model):
-    id = fields.IntField(pk=True)
+    id = fields.BigIntField(pk=True)
     address = fields.CharField(59)
-    amount = fields.IntField()
-    level = fields.IntField()
+    amount = fields.BigIntField()
+    level = fields.BigIntField()
     timestamp = fields.DatetimeField()
     holder = fields.ForeignKeyField('models.Address', 'tokens')
 
@@ -28,24 +28,24 @@ class Meta:
 
 
 class Auction(Model):
-    id = fields.IntField(pk=True)
+    id = fields.BigIntField(pk=True)
     token = fields.ForeignKeyField('models.Token', 'auctions')
-    bid_amount = fields.IntField()
+    bid_amount = fields.BigIntField()
     bidder = fields.ForeignKeyField('models.Address', 'winning_auctions')
     seller = fields.ForeignKeyField('models.Address', 'created_auctions')
     end_timestamp = fields.DatetimeField()
     status = fields.IntEnumField(AuctionStatus)
-    level = fields.IntField()
+    level = fields.BigIntField()
     timestamp = fields.DatetimeField()
 
     class Meta:
         table = 'auctions'
 
 
 class Bid(Model):
-    id = fields.IntField(pk=True)
+    id = fields.BigIntField(pk=True)
     auction = fields.ForeignKeyField('models.Auction', 'bids')
-    bid_amount = fields.IntField()
+    bid_amount = fields.BigIntField()
     bidder = fields.ForeignKeyField('models.Address', 'bids')
-    level = fields.IntField()
+    level = fields.BigIntField()
     timestamp = fields.DatetimeField()