Merge pull request #33 from cybercongress/setup-update

cybercongress · Oct 1, 2024 · 1d3d49f · 1d3d49f
2 parents 5b21ec6 + 3793cc5
commit 1d3d49f
Show file tree

Hide file tree

Showing 21 changed files with 24 additions and 81 deletions.
diff --git a/.env b/.env
@@ -1,13 +1,26 @@
+#chain params 
 CHAIN_PREFIX=bostrom
+RPC_URL=http://localhost:26657
+GRPC_URL=http://localhost:9090
+GPRC_INSECURE=true
+
+#database params
 POSTGRES_FOLDER=$HOME/.cyberindex/postgres
 POSTGRES_HOST=localhost
 POSTGRES_PORT=5432
+POSTGRES_DB=cyberindex
 POSTGRES_USER=cyber
 POSTGRES_PASSWORD=1cyberindex1
 POSTGRES_SSL=false
+
+#hasura params
 HASURA_PORT=8090
 HASURA_ADMIN_SECRET=1hasura1
+
+#indexing settings
 INDEX_WORKERS=1
-RPC_URL=http://localhost:26657
-GRPC_URL=http://localhost:9090
 START_HEIGHT=1
+LISTEN_NEW_BLOCKS=true
+PARSE_OLD_BLOCKS=true
+PARSE_GENESIS=true
+LOG_LEVEL=debug
diff --git a/Dockerfile b/Dockerfile
@@ -19,11 +19,9 @@ ENV PATH="/usr/local/go/bin:$PATH"
 
 COPY . .
 
-ADD https://github.com/CosmWasm/wasmvm/releases/download/v1.5.0/libwasmvm_muslc.x86_64.a /lib/libwasmvm_muslc.a
-
 RUN go mod download
 
-RUN LINK_STATICALLY=true BUILD_TAGS="muslc" make build
+RUN make build
 
 FROM ubuntu:22.04 
 
@@ -33,7 +31,7 @@ WORKDIR /app
 
 COPY --from=builder /app/build/cyberindex /usr/bin/cyberindex
 
-#COPY --from=builder /root/go/pkg/mod/github.com/!cosm!wasm/[email protected].0/internal/api/libwasmvm.x86_64.so /root/go/pkg/mod/github.com/!cosm!wasm/[email protected].0/internal/api/libwasmvm.x86_64.so
+COPY --from=builder /root/go/pkg/mod/github.com/!cosm!wasm/[email protected].2/internal/api/libwasmvm.x86_64.so /root/go/pkg/mod/github.com/!cosm!wasm/[email protected].2/internal/api/libwasmvm.x86_64.so
 
 COPY ./entrypoint.sh /entrypoint.sh
 

diff --git a/database/schema/gift_db.py → database/create_cybergift_py/gift_db.py b/database/schema/gift_db.py → database/create_cybergift_py/gift_db.py
diff --git a/database/schema/requirements.txt → ...base/create_cybergift_py/requirements.txt b/database/schema/requirements.txt → ...base/create_cybergift_py/requirements.txt
diff --git a/database/schema/00-cosmos.sql → database/schema/000-cosmos.sql b/database/schema/00-cosmos.sql → database/schema/000-cosmos.sql
diff --git a/database/schema/01-auth.sql → database/schema/001-auth.sql b/database/schema/01-auth.sql → database/schema/001-auth.sql
diff --git a/database/schema/02-bank.sql → database/schema/002-bank.sql b/database/schema/02-bank.sql → database/schema/002-bank.sql
diff --git a/database/schema/03-modules.sql → database/schema/003-modules.sql b/database/schema/03-modules.sql → database/schema/003-modules.sql
diff --git a/database/schema/04-consensus.sql → database/schema/004-consensus.sql b/database/schema/04-consensus.sql → database/schema/004-consensus.sql
diff --git a/database/schema/04-graph.sql → database/schema/005-graph.sql b/database/schema/04-graph.sql → database/schema/005-graph.sql
diff --git a/database/schema/05-grid.sql → database/schema/006-grid.sql b/database/schema/05-grid.sql → database/schema/006-grid.sql
diff --git a/database/schema/06-resources.sql → database/schema/007-resources.sql b/database/schema/06-resources.sql → database/schema/007-resources.sql
diff --git a/database/schema/08-liquidity.sql → database/schema/008-liquidity.sql b/database/schema/08-liquidity.sql → database/schema/008-liquidity.sql
diff --git a/database/schema/07-wasm.sql → database/schema/009-wasm.sql b/database/schema/07-wasm.sql → database/schema/009-wasm.sql
diff --git a/database/schema/cyber_gift.sql → database/schema/010-cyber_gift.sql b/database/schema/cyber_gift.sql → database/schema/010-cyber_gift.sql
diff --git a/database/schema/views.sql → database/schema/011-views.sql b/database/schema/views.sql → database/schema/011-views.sql
diff --git a/database/schema/setup.sh b/database/schema/setup.sh
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -8,23 +8,23 @@ services:
         container_name: cyberindex_postgres
         volumes:
             - $HOME/.cyberindex/postgres:/var/lib/postgresql/data
-            - ./database/schema/:/root/schema
+            - ./database/schema/:/docker-entrypoint-initdb.d/
         environment:
             - POSTGRES_DB=${POSTGRES_DB}
             - POSTGRES_USER=${POSTGRES_USER}
             - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
         networks:
             - cyberindex-net
         ports:
-            - 127.0.0.1:${POSTGRES_DB_PORT}:5432
+            - 127.0.0.1:${POSTGRES_PORT}:5432
     hasura:
         image: hasura/graphql-engine:latest
         restart: always
         container_name: cyberindex_hasura
         depends_on:
             - "postgres"
         environment:
-            HASURA_GRAPHQL_DATABASE_URL: postgres://${POSTGRES_USER}:${POSTGRES_PASSWORD}@172.28.1.2:${POSTGRES_PORT}/${POSTGRES_USER}
+            HASURA_GRAPHQL_DATABASE_URL: postgres://${POSTGRES_USER}:${POSTGRES_PASSWORD}@172.28.1.2:${POSTGRES_PORT}/${POSTGRES_DB}
             HASURA_GRAPHQL_ENABLE_CONSOLE: "true"
             HASURA_GRAPHQL_ENABLED_LOG_TYPES: startup, http-log, webhook-log, websocket-log, query-log
             HASURA_GRAPHQL_ADMIN_SECRET: $HASURA_ADMIN_SECRET
@@ -34,16 +34,15 @@ services:
         ports:
             - 127.0.0.1:${HASURA_PORT}:8080
     cyberindex:
-        image: cyberd/cyberindex:v2.0.0-rc1
+        image: cyberd/cyberindex:v2.0.0
         restart: always
+        shm_size: 1g
         container_name: cyberindex
         volumes:
             - $HOME/.cyberindex/:/root/.cyberindex
             - .env:/.env
         networks:
             - cyberindex-net
-        ports:
-            - 127.0.0.1:${POSTGRES_DB_PORT}:5432
         depends_on:
             - "postgres"
 networks:

diff --git a/entrypoint.sh b/entrypoint.sh
@@ -4,20 +4,13 @@ if [ ! -d "/root/.cyberindex/" ]
 then
     export $(cat /.env)
     mkdir /root/.cyberindex
-    echo -e "chain:\n    bech32_prefix: $CHAIN_PREFIX\n    modules:\n        - modules\n        - messages\n        - auth\n        - consensus\n        - daily refetch\n        - message_type\n        - bank\n        - graph\n        - grid\n        - resources\n        - wasm\nnode:\n    type: remote\n    config:\n        rpc:\n            client_name: \"cyberindex\"\n            max_connections: 10\n            address: \"$RPC_URL\"\n        grpc:\n            address: \"$GRPC_URL\"\n            insecure: true\nparsing:\n    workers: $INDEX_WORKERS\n    start_height: $START_HEIGHT\n    average_block_time: 5s\n    listen_new_blocks: true\n    parse_old_blocks: true\n    parse_genesis: true\ndatabase:\n    url: postgresql://$POSTGRES_USER:$POSTGRES_PASSWORD@$POSTGRES_HOST:5432/$POSTGRES_USER?sslmode=disable&search_path=public\n    max_open_connections: 1\n    max_idle_connections: 1\n    partition_size: 100000\n    partition_batch: 1000\n    ssl_mode_enable: \"$POSTGRES_SSL\"\n    ssl_root_cert: \"\"\n    ssl_cert: \"\"\n    ssl_key: \"\"\nlogging:\n    level: debug\n    format: text\nactions:\n    host: 127.0.0.1\n    port: 3000" >> /root/.cyberindex/config.yaml
-fi
-
-if [ -f "/root/.cyberindex/config.yaml" ]
-then
-    export $(cat /.env)
-    rm /root/.cyberindex/config.yaml
-    echo -e "chain:\n    bech32_prefix: $CHAIN_PREFIX\n    modules:\n        - modules\n        - messages\n        - auth\n        - consensus\n        - daily refetch\n        - message_type\n        - bank\n        - graph\n        - grid\n        - resources\n        - wasm\nnode:\n    type: remote\n    config:\n        rpc:\n            client_name: \"cyberindex\"\n            max_connections: 10\n            address: \"$RPC_URL\"\n        grpc:\n            address: \"$GRPC_URL\"\n            insecure: true\nparsing:\n    workers: $INDEX_WORKERS\n    start_height: $START_HEIGHT\n    average_block_time: 5s\n    listen_new_blocks: true\n    parse_old_blocks: true\n    parse_genesis: true\ndatabase:\n    url: postgresql://$POSTGRES_USER:$POSTGRES_PASSWORD@$POSTGRES_HOST:5432/$POSTGRES_USER?sslmode=disable&search_path=public\n    max_open_connections: 1\n    max_idle_connections: 1\n    partition_size: 100000\n    partition_batch: 1000\n    ssl_mode_enable: \"$POSTGRES_SSL\"\n    ssl_root_cert: \"\"\n    ssl_cert: \"\"\n    ssl_key: \"\"\nlogging:\n    level: debug\n    format: text\nactions:\n    host: 127.0.0.1\n    port: 3000" > /root/.cyberindex/config.yaml
+    echo -e "chain:\n    bech32_prefix: $CHAIN_PREFIX\n    modules:\n        - modules\n        - messages\n        - auth\n        - consensus\n        - daily refetch\n        - message_type\n        - bank\n        - graph\n        - grid\n        - resources\n        - wasm\nnode:\n    type: remote\n    config:\n        rpc:\n            client_name: \"cyberindex\"\n            max_connections: 10\n            address: \"$RPC_URL\"\n        grpc:\n            address: \"$GRPC_URL\"\n            insecure: $GPRC_INSECURE\n    workers: $INDEX_WORKERS\n    start_height: $START_HEIGHT\n    average_block_time: 5s\n    listen_new_blocks: $LISTEN_NEW_BLOCKS\n    parse_old_blocks: $PARSE_OLD_BLOCKS\n    parse_genesis: $PARSE_GENESIS\ndatabase:\n    url: postgresql://$POSTGRES_USER:$POSTGRES_PASSWORD@$POSTGRES_HOST:5432/$POSTGRES_DB?sslmode=disable&search_path=public\n    max_open_connections: 1\n    max_idle_connections: 1\n    partition_size: 100000\n    partition_batch: 1000\n    ssl_mode_enable: \"$POSTGRES_SSL\"\n    ssl_root_cert: \"\"\n    ssl_cert: \"\"\n    ssl_key: \"\"\nlogging:\n    level: $LOG_LEVEL\n    format: text\nactions:\n    host: 127.0.0.1\n    port: 3000" >> /root/.cyberindex/config.yaml
 fi
 
 if [ ! -f "/root/.cyberindex/config.yaml" ]
 then
     export $(cat /.env)
-    echo -e "chain:\n    bech32_prefix: $CHAIN_PREFIX\n    modules:\n        - modules\n        - messages\n        - auth\n        - consensus\n        - daily refetch\n        - message_type\n        - bank\n        - graph\n        - grid\n        - resources\n        - wasm\nnode:\n    type: remote\n    config:\n        rpc:\n            client_name: \"cyberindex\"\n            max_connections: 10\n            address: \"$RPC_URL\"\n        grpc:\n            address: \"$GRPC_URL\"\n            insecure: true\nparsing:\n    workers: $INDEX_WORKERS\n    start_height: $START_HEIGHT\n    average_block_time: 5s\n    listen_new_blocks: true\n    parse_old_blocks: true\n    parse_genesis: true\ndatabase:\n    url: postgresql://$POSTGRES_USER:$POSTGRES_PASSWORD@$POSTGRES_HOST:5432/$POSTGRES_USER?sslmode=disable&search_path=public\n    max_open_connections: 1\n    max_idle_connections: 1\n    partition_size: 100000\n    partition_batch: 1000\n    ssl_mode_enable: \"$POSTGRES_SSL\"\n    ssl_root_cert: \"\"\n    ssl_cert: \"\"\n    ssl_key: \"\"\nlogging:\n    level: debug\n    format: text\nactions:\n    host: 127.0.0.1\n    port: 3000" >> /root/.cyberindex/config.yaml
+    echo -e "chain:\n    bech32_prefix: $CHAIN_PREFIX\n    modules:\n        - modules\n        - messages\n        - auth\n        - consensus\n        - daily refetch\n        - message_type\n        - bank\n        - graph\n        - grid\n        - resources\n        - wasm\nnode:\n    type: remote\n    config:\n        rpc:\n            client_name: \"cyberindex\"\n            max_connections: 10\n            address: \"$RPC_URL\"\n        grpc:\n            address: \"$GRPC_URL\"\n            insecure: $GPRC_INSECURE\n    workers: $INDEX_WORKERS\n    start_height: $START_HEIGHT\n    average_block_time: 5s\n    listen_new_blocks: $LISTEN_NEW_BLOCKS\n    parse_old_blocks: $PARSE_OLD_BLOCKS\n    parse_genesis: $PARSE_GENESIS\ndatabase:\n    url: postgresql://$POSTGRES_USER:$POSTGRES_PASSWORD@$POSTGRES_HOST:5432/$POSTGRES_DB?sslmode=disable&search_path=public\n    max_open_connections: 1\n    max_idle_connections: 1\n    partition_size: 100000\n    partition_batch: 1000\n    ssl_mode_enable: \"$POSTGRES_SSL\"\n    ssl_root_cert: \"\"\n    ssl_cert: \"\"\n    ssl_key: \"\"\nlogging:\n    level: $LOG_LEVEL\n    format: text\nactions:\n    host: 127.0.0.1\n    port: 3000" >> /root/.cyberindex/config.yaml
 fi
 
 exec "$@"
diff --git a/scripts/start-docker.sh b/scripts/start-docker.sh
diff --git a/scripts/stop-rm.sh b/scripts/stop-rm.sh