diff --git a/docker/indexer/docker-compose.yml b/docker/indexer/docker-compose.yml index c8dacf1..307d462 100644 --- a/docker/indexer/docker-compose.yml +++ b/docker/indexer/docker-compose.yml @@ -16,7 +16,6 @@ services: - PROTOKIT_LOG_LEVEL=${PROTOKIT_LOG_LEVEL} - PROTOKIT_INDEXER_GRAPHQL_HOST=${PROTOKIT_INDEXER_GRAPHQL_HOST} - PROTOKIT_INDEXER_GRAPHQL_PORT=${PROTOKIT_INDEXER_GRAPHQL_PORT} - - PROTOKIT_INDEXER_GRAPHIQL_ENABLED=${PROTOKIT_INDEXER_GRAPHIQL_ENABLED} profiles: - monolithic-indexer depends_on: diff --git a/docker/processor/docker-compose.yml b/docker/processor/docker-compose.yml index 820205a..35a633f 100644 --- a/docker/processor/docker-compose.yml +++ b/docker/processor/docker-compose.yml @@ -11,10 +11,8 @@ services: - PROTOKIT_LOG_LEVEL=${PROTOKIT_LOG_LEVEL} - PROTOKIT_PROCESSOR_GRAPHQL_HOST=${PROTOKIT_PROCESSOR_GRAPHQL_HOST} - PROTOKIT_PROCESSOR_GRAPHQL_PORT=${PROTOKIT_PROCESSOR_GRAPHQL_PORT} - - PROTOKIT_PROCESSOR_GRAPHIQL_ENABLED=${PROTOKIT_PROCESSOR_GRAPHIQL_ENABLED} - PROTOKIT_PROCESSOR_INDEXER_GRAPHQL_HOST=${PROTOKIT_PROCESSOR_INDEXER_GRAPHQL_HOST} - PROTOKIT_INDEXER_GRAPHQL_PORT=${PROTOKIT_INDEXER_GRAPHQL_PORT} - - PROTOKIT_BLOCK_INTERVAL=${PROTOKIT_BLOCK_INTERVAL} profiles: - monolithic-processor depends_on: diff --git a/docker/sequencer/docker-compose.yml b/docker/sequencer/docker-compose.yml index 865adcf..f00eab7 100644 --- a/docker/sequencer/docker-compose.yml +++ b/docker/sequencer/docker-compose.yml @@ -23,14 +23,10 @@ services: - MINA_ARCHIVE_GRAPHQL_PORT=${MINA_ARCHIVE_GRAPHQL_PORT} - PROTOKIT_TRANSACTION_FEE_RECIPIENT_PRIVATE_KEY=${PROTOKIT_TRANSACTION_FEE_RECIPIENT_PRIVATE_KEY} - PROTOKIT_TRANSACTION_FEE_RECIPIENT_PUBLIC_KEY=${PROTOKIT_TRANSACTION_FEE_RECIPIENT_PUBLIC_KEY} - - PROTOKIT_SETTLEMENT_INTERVAL=${PROTOKIT_SETTLEMENT_INTERVAL} - - PROTOKIT_SETTLEMENT_ENABLED=${PROTOKIT_SETTLEMENT_ENABLED} - PROTOKIT_SHOULD_ATTEMPT_DB_MIGRATION=${PROTOKIT_SHOULD_ATTEMPT_DB_MIGRATION} - PROTOKIT_LOG_LEVEL=${PROTOKIT_LOG_LEVEL} - - PROTOKIT_BLOCK_INTERVAL=${PROTOKIT_BLOCK_INTERVAL} - PROTOKIT_GRAPHQL_HOST=${PROTOKIT_GRAPHQL_HOST} - PROTOKIT_GRAPHQL_PORT=${PROTOKIT_GRAPHQL_PORT} - - PROTOKIT_GRAPHIQL_ENABLED=${PROTOKIT_GRAPHIQL_ENABLED} - PROTOKIT_SEQUENCER_PRIVATE_KEY=${PROTOKIT_SEQUENCER_PRIVATE_KEY} - PROTOKIT_SEQUENCER_PUBLIC_KEY=${PROTOKIT_SEQUENCER_PUBLIC_KEY} - PROTOKIT_SETTLEMENT_CONTRACT_PRIVATE_KEY=${PROTOKIT_SETTLEMENT_CONTRACT_PRIVATE_KEY} @@ -40,13 +36,10 @@ services: - PROTOKIT_MINA_BRIDGE_CONTRACT_PRIVATE_KEY=${PROTOKIT_MINA_BRIDGE_CONTRACT_PRIVATE_KEY} - PROTOKIT_MINA_BRIDGE_CONTRACT_PUBLIC_KEY=${PROTOKIT_MINA_BRIDGE_CONTRACT_PUBLIC_KEY} - - OPEN_TELEMETRY_TRACING_ENABLED=${OPEN_TELEMETRY_TRACING_ENABLED} - OPEN_TELEMETRY_TRACING_URL=${OPEN_TELEMETRY_TRACING_URL} - - OPEN_TELEMETRY_METRICS_ENABLED=${OPEN_TELEMETRY_METRICS_ENABLED} - OPEN_TELEMETRY_METRICS_PORT=${OPEN_TELEMETRY_METRICS_PORT} - OPEN_TELEMETRY_METRICS_HOST=${OPEN_TELEMETRY_METRICS_HOST} - - OPEN_TELEMETRY_METRICS_SCRAPING_FREQUENCY=${OPEN_TELEMETRY_METRICS_SCRAPING_FREQUENCY} profiles: - monolithic-sequencer depends_on: diff --git a/docker/worker/docker-compose.yml b/docker/worker/docker-compose.yml index 482f4fe..49cc36f 100644 --- a/docker/worker/docker-compose.yml +++ b/docker/worker/docker-compose.yml @@ -22,8 +22,6 @@ services: - PROTOKIT_DISPATCHER_CONTRACT_PUBLIC_KEY=${PROTOKIT_DISPATCHER_CONTRACT_PUBLIC_KEY} - PROTOKIT_MINA_BRIDGE_CONTRACT_PRIVATE_KEY=${PROTOKIT_MINA_BRIDGE_CONTRACT_PRIVATE_KEY} - PROTOKIT_MINA_BRIDGE_CONTRACT_PUBLIC_KEY=${PROTOKIT_MINA_BRIDGE_CONTRACT_PUBLIC_KEY} - - PROTOKIT_SETTLEMENT_INTERVAL=${PROTOKIT_SETTLEMENT_INTERVAL} - - PROTOKIT_SETTLEMENT_ENABLED=${PROTOKIT_SETTLEMENT_ENABLED} profiles: - worker depends_on: diff --git a/packages/chain/src/core/environments/development/.env b/packages/chain/src/core/environments/development/.env index a4ff88a..dcf900d 100644 --- a/packages/chain/src/core/environments/development/.env +++ b/packages/chain/src/core/environments/development/.env @@ -16,14 +16,10 @@ REDIS_PASSWORD=password PROTOKIT_PROOFS_ENABLED=false PROTOKIT_SHOULD_ATTEMPT_DB_MIGRATION=true -PROTOKIT_PRUNE_ON_STARTUP=false PROTOKIT_LOG_LEVEL=INFO -PROTOKIT_BLOCK_INTERVAL=30000 -PROTOKIT_SETTLEMENT_INTERVAL=60000 PROTOKIT_GRAPHQL_HOST=0.0.0.0 PROTOKIT_GRAPHQL_PORT=8080 -PROTOKIT_GRAPHIQL_ENABLED=true FORCE_COLOR=3 TS_NODE_TRANSPILE_ONLY=true @@ -39,7 +35,6 @@ PROTOKIT_SHOULD_ATTEMPT_INDEXER_DB_MIGRATION=true PROTOKIT_INDEXER_GRAPHQL_HOST=0.0.0.0 PROTOKIT_INDEXER_GRAPHQL_PORT=8081 -PROTOKIT_INDEXER_GRAPHIQL_ENABLED=true PROCESSOR_POSTGRES_PASSWORD=password PROCESSOR_POSTGRES_USER=admin @@ -51,7 +46,6 @@ PROTOKIT_SHOULD_ATTEMPT_PROCESSOR_DB_MIGRATION=true PROTOKIT_PROCESSOR_GRAPHQL_HOST=0.0.0.0 PROTOKIT_PROCESSOR_GRAPHQL_PORT=8082 -PROTOKIT_PROCESSOR_GRAPHIQL_ENABLED=true PROTOKIT_PROCESSOR_INDEXER_GRAPHQL_HOST=0.0.0.0 @@ -69,8 +63,6 @@ MINA_ARCHIVE_GRAPHQL_PORT=8085 PROTOKIT_TRANSACTION_FEE_RECIPIENT_PRIVATE_KEY=EKEssvj33MMBCg2tcybTzL32nTKbbwFHm6yUxd3JassdhL3J5aT8 PROTOKIT_TRANSACTION_FEE_RECIPIENT_PUBLIC_KEY=B62qk4sNnzZqqjHp8YQXZUV3dBpnjiNieJVnsuh7mD2bMJ9PdbskH5H -PROTOKIT_SETTLEMENT_ENABLED=true - PROTOKIT_SEQUENCER_PRIVATE_KEY=EKEdKhgUHMuDvwWJEg2TdCMCeiTSd9hh2HrEr6uYJfPVuwur1s43 PROTOKIT_SEQUENCER_PUBLIC_KEY=B62qizW6aroTxQorJz4ywVNZom4jA6W4QPPCK3wLeyhnJHtVStUNniL PROTOKIT_SETTLEMENT_CONTRACT_PRIVATE_KEY=EKErS9gYHZNawqKuwfMiwYYJtNptCrvca491QEvB3tz8sFsS5w66 @@ -95,13 +87,10 @@ TEST_ACCOUNT_1_PUBLIC_KEY=B62qkVfEwyfkm5yucHEqrRjxbyx98pgdWz82pHv7LYq9Qigs812iWZ # generating mock proofs during development seems to be triggering a lot of warnings in node v22.9.0 NODE_NO_WARNINGS=1 -OPEN_TELEMETRY_TRACING_ENABLED=true OPEN_TELEMETRY_TRACING_URL=http://localhost:4318 -OPEN_TELEMETRY_METRICS_ENABLED=true OPEN_TELEMETRY_METRICS_PORT=4320 OPEN_TELEMETRY_METRICS_HOST=0.0.0.0 -OPEN_TELEMETRY_METRICS_SCRAPING_FREQUENCY=10 GF_SECURITY_ADMIN_USER=admin GF_SECURITY_ADMIN_PASSWORD=grafana \ No newline at end of file diff --git a/packages/chain/src/core/environments/development/chain.config.ts b/packages/chain/src/core/environments/development/chain.config.ts index 2d00dd5..6fab60b 100644 --- a/packages/chain/src/core/environments/development/chain.config.ts +++ b/packages/chain/src/core/environments/development/chain.config.ts @@ -65,16 +65,14 @@ export default async (args: Arguments): Promise => { containerConfig: { port: Number(process.env.PROTOKIT_GRAPHQL_PORT ?? 8080), host: process.env.PROTOKIT_GRAPHQL_HOST ?? "0.0.0.0", - graphiql: process.env.PROTOKIT_GRAPHIQL_ENABLED !== "false", + graphiql: true, }, }, Mempool: {}, BlockTrigger: { - blockInterval: Number(process.env.PROTOKIT_BLOCK_INTERVAL ?? 30000), + blockInterval: 30000, produceEmptyBlocks: true, - settlementInterval: Number( - process.env.PROTOKIT_SETTLEMENT_INTERVAL ?? 60000 - ), + settlementInterval: 60000, settlementTokenConfig: buildSettlementTokenConfig( process.env.PROTOKIT_MINA_BRIDGE_CONTRACT_PRIVATE_KEY!, buildCustomTokenConfig( diff --git a/packages/chain/src/core/environments/development/indexer.config.ts b/packages/chain/src/core/environments/development/indexer.config.ts index 455b721..0f6ef97 100644 --- a/packages/chain/src/core/environments/development/indexer.config.ts +++ b/packages/chain/src/core/environments/development/indexer.config.ts @@ -59,7 +59,7 @@ export default async (args: Arguments): Promise => { containerConfig: { port: Number(process.env.PROTOKIT_INDEXER_GRAPHQL_PORT ?? 8081), host: process.env.PROTOKIT_INDEXER_GRAPHQL_HOST ?? "0.0.0.0", - graphiql: process.env.PROTOKIT_INDEXER_GRAPHIQL_ENABLED !== "false", + graphiql: true, }, }, }); diff --git a/packages/chain/src/core/environments/development/processor.config.ts b/packages/chain/src/core/environments/development/processor.config.ts index 5c479c7..603dcd3 100644 --- a/packages/chain/src/core/environments/development/processor.config.ts +++ b/packages/chain/src/core/environments/development/processor.config.ts @@ -6,9 +6,7 @@ import { HandlersExecutor, ResolverFactoryGraphqlModule, } from "@proto-kit/processor"; -import { - GraphqlSequencerModule, -} from "@proto-kit/api"; +import { GraphqlSequencerModule } from "@proto-kit/api"; import { databaseModule } from "../../processor"; import { Arguments } from "../../../start"; import { Startable } from "@proto-kit/common"; @@ -33,7 +31,7 @@ export default async (args: Arguments): Promise => { url: `http://${process.env.PROTOKIT_PROCESSOR_INDEXER_GRAPHQL_HOST ?? "0.0.0.0"}:${process.env.PROTOKIT_INDEXER_GRAPHQL_PORT ?? 8081}`, }, Trigger: { - interval: Number(process.env.PROTOKIT_BLOCK_INTERVAL ?? 30000) / 5, + interval: 6000, }, GraphqlSequencerModule: { ResolverFactory: {}, diff --git a/packages/chain/src/core/environments/inmemory/.env b/packages/chain/src/core/environments/inmemory/.env index ef9ed19..67d13c0 100644 --- a/packages/chain/src/core/environments/inmemory/.env +++ b/packages/chain/src/core/environments/inmemory/.env @@ -1,9 +1,10 @@ PROTOKIT_LOG_LEVEL=INFO -PROTOKIT_BLOCK_INTERVAL=5000 PROTOKIT_GRAPHQL_HOST=localhost PROTOKIT_GRAPHQL_PORT=8080 -PROTOKIT_GRAPHIQL_ENABLED=true + +PROTOKIT_TRANSACTION_FEE_RECIPIENT_PRIVATE_KEY=EKEssvj33MMBCg2tcybTzL32nTKbbwFHm6yUxd3JassdhL3J5aT8 +PROTOKIT_TRANSACTION_FEE_RECIPIENT_PUBLIC_KEY=B62qk4sNnzZqqjHp8YQXZUV3dBpnjiNieJVnsuh7mD2bMJ9PdbskH5H # expose graphql configuration to the client app-chain NEXT_PUBLIC_PROTOKIT_GRAPHQL_URL=http://localhost:8080/graphql diff --git a/packages/chain/src/core/environments/inmemory/chain.config.ts b/packages/chain/src/core/environments/inmemory/chain.config.ts index c9d2644..99d2810 100644 --- a/packages/chain/src/core/environments/inmemory/chain.config.ts +++ b/packages/chain/src/core/environments/inmemory/chain.config.ts @@ -51,7 +51,7 @@ export default async (): Promise => { containerConfig: { port: Number(process.env.PROTOKIT_GRAPHQL_PORT), host: process.env.PROTOKIT_GRAPHQL_HOST ?? "localhost", - graphiql: process.env.PROTOKIT_GRAPHIQL_ENABLED !== "false", + graphiql: true, }, }, Mempool: {}, @@ -60,7 +60,7 @@ export default async (): Promise => { BlockProducerModule: {}, }, BlockTrigger: { - blockInterval: Number(process.env.PROTOKIT_BLOCK_INTERVAL ?? 5000), + blockInterval: 5000, produceEmptyBlocks: true, settlementTokenConfig: {}, }, diff --git a/packages/chain/src/core/environments/sovereign/.env b/packages/chain/src/core/environments/sovereign/.env index 41fec50..d50a809 100644 --- a/packages/chain/src/core/environments/sovereign/.env +++ b/packages/chain/src/core/environments/sovereign/.env @@ -14,16 +14,10 @@ REDIS_PORT=6379 REDIS_PASSWORD=password PROTOKIT_SHOULD_ATTEMPT_DB_MIGRATION=true -PROTOKIT_PRUNE_ON_STARTUP=false PROTOKIT_LOG_LEVEL=INFO -PROTOKIT_BLOCK_INTERVAL=10000 -PROTOKIT_SETTLEMENT_INTERVAL=30000 -PROTOKIT_SETTLEMENT_ENABLED=true - PROTOKIT_GRAPHQL_HOST=0.0.0.0 PROTOKIT_GRAPHQL_PORT=8080 -PROTOKIT_GRAPHIQL_ENABLED=true FORCE_COLOR=3 TS_NODE_TRANSPILE_ONLY=true @@ -39,7 +33,6 @@ PROTOKIT_SHOULD_ATTEMPT_INDEXER_DB_MIGRATION=true PROTOKIT_INDEXER_GRAPHQL_HOST=0.0.0.0 PROTOKIT_INDEXER_GRAPHQL_PORT=8081 -PROTOKIT_INDEXER_GRAPHIQL_ENABLED=true PROCESSOR_POSTGRES_PASSWORD=password @@ -52,7 +45,6 @@ PROTOKIT_SHOULD_ATTEMPT_PROCESSOR_DB_MIGRATION=true PROTOKIT_PROCESSOR_GRAPHQL_HOST=0.0.0.0 PROTOKIT_PROCESSOR_GRAPHQL_PORT=8082 -PROTOKIT_PROCESSOR_GRAPHIQL_ENABLED=true PROTOKIT_PROCESSOR_INDEXER_GRAPHQL_HOST=indexer @@ -71,8 +63,6 @@ MINA_ARCHIVE_GRAPHQL_PORT=8282 PROTOKIT_TRANSACTION_FEE_RECIPIENT_PRIVATE_KEY=EKEssvj33MMBCg2tcybTzL32nTKbbwFHm6yUxd3JassdhL3J5aT8 PROTOKIT_TRANSACTION_FEE_RECIPIENT_PUBLIC_KEY=B62qk4sNnzZqqjHp8YQXZUV3dBpnjiNieJVnsuh7mD2bMJ9PdbskH5H -PROTOKIT_SETTLEMENT_ENABLED=true - PROTOKIT_SEQUENCER_PRIVATE_KEY=EKEdKhgUHMuDvwWJEg2TdCMCeiTSd9hh2HrEr6uYJfPVuwur1s43 PROTOKIT_SEQUENCER_PUBLIC_KEY=B62qizW6aroTxQorJz4ywVNZom4jA6W4QPPCK3wLeyhnJHtVStUNniL PROTOKIT_SETTLEMENT_CONTRACT_PRIVATE_KEY=EKErS9gYHZNawqKuwfMiwYYJtNptCrvca491QEvB3tz8sFsS5w66 @@ -92,13 +82,10 @@ TEST_ACCOUNT_1_PUBLIC_KEY=B62qkVfEwyfkm5yucHEqrRjxbyx98pgdWz82pHv7LYq9Qigs812iWZ # generating mock proofs during development seems to be triggering a lot of warnings in node v22.9.0 NODE_NO_WARNINGS=1 -OPEN_TELEMETRY_TRACING_ENABLED=true OPEN_TELEMETRY_TRACING_URL=http://otel-collector:4317 -OPEN_TELEMETRY_METRICS_ENABLED=true OPEN_TELEMETRY_METRICS_PORT=4320 OPEN_TELEMETRY_METRICS_HOST=0.0.0.0 -OPEN_TELEMETRY_METRICS_SCRAPING_FREQUENCY=10 GF_SECURITY_ADMIN_USER=admin GF_SECURITY_ADMIN_PASSWORD=grafana \ No newline at end of file diff --git a/packages/chain/src/core/environments/sovereign/chain.config.ts b/packages/chain/src/core/environments/sovereign/chain.config.ts index 17bb2c1..94c26b7 100644 --- a/packages/chain/src/core/environments/sovereign/chain.config.ts +++ b/packages/chain/src/core/environments/sovereign/chain.config.ts @@ -71,18 +71,16 @@ export default async (args: Arguments): Promise => { containerConfig: { port: Number(process.env.PROTOKIT_GRAPHQL_PORT ?? 8080), host: process.env.PROTOKIT_GRAPHQL_HOST ?? "0.0.0.0", - graphiql: process.env.PROTOKIT_GRAPHIQL_ENABLED !== "false", + graphiql: true, }, }, Mempool: {}, BlockProducerModule: {}, BlockTrigger: { - blockInterval: Number(process.env.PROTOKIT_BLOCK_INTERVAL ?? 10000), + blockInterval: 10000, produceEmptyBlocks: true, - settlementInterval: Number( - process.env.PROTOKIT_SETTLEMENT_INTERVAL ?? 60000 - ), + settlementInterval: 60000, settlementTokenConfig: buildSettlementTokenConfig( process.env.PROTOKIT_MINA_BRIDGE_CONTRACT_PRIVATE_KEY!, buildCustomTokenConfig( diff --git a/packages/chain/src/core/environments/sovereign/processor.config.ts b/packages/chain/src/core/environments/sovereign/processor.config.ts index 14903c1..cf31ba9 100644 --- a/packages/chain/src/core/environments/sovereign/processor.config.ts +++ b/packages/chain/src/core/environments/sovereign/processor.config.ts @@ -29,7 +29,7 @@ export default async (args: Arguments): Promise => { url: `http://${process.env.PROTOKIT_PROCESSOR_INDEXER_GRAPHQL_HOST ?? "0.0.0.0"}:${process.env.PROTOKIT_INDEXER_GRAPHQL_PORT ?? 8081}`, }, Trigger: { - interval: Number(process.env.PROTOKIT_BLOCK_INTERVAL ?? 30000) / 5, + interval: 2000, }, GraphqlSequencerModule: { ResolverFactory: {}, diff --git a/packages/chain/src/core/sequencer/index.ts b/packages/chain/src/core/sequencer/index.ts index f9a7e0a..c3ff33f 100644 --- a/packages/chain/src/core/sequencer/index.ts +++ b/packages/chain/src/core/sequencer/index.ts @@ -69,18 +69,16 @@ export const metricsSequencerModules = { export const metricsSequencerModulesConfig = { OpenTelemetryServer: { metrics: { - enabled: Boolean(process.env.OPEN_TELEMETRY_METRICS_ENABLED ?? false), + enabled: true, prometheus: { host: process.env.OPEN_TELEMETRY_METRICS_HOST ?? "localhost", port: Number(process.env.OPEN_TELEMETRY_METRICS_PORT), appendTimestamp: true, }, - nodeScrapeInterval: Number( - process.env.OPEN_TELEMETRY_METRICS_SCRAPING_FREQUENCY ?? 10 - ), + nodeScrapeInterval: 10, }, tracing: { - enabled: Boolean(process.env.OPEN_TELEMETRY_TRACING_ENABLED ?? false), + enabled: true, otlp: { url: process.env.OPEN_TELEMETRY_TRACING_URL, },