Merge pull request #1223 from input-output-hk/fix/LW-10312_activate_p…

…ool_delisting-schedule

fix: add needed params in the docker composer file to activate batch pool delisting

compose/common.yml

@@ -207,8 +207,9 @@ services:
       <<: *sdk-environment
       API_URL: http://0.0.0.0:3003
       QUEUES: ${QUEUES:-pool-delist-schedule,pool-metadata,pool-metrics,pool-rewards}
+      SCHEDULES: ${SCHEDULES:-/config/schedules.json}
       STAKE_POOL_PROVIDER_URL: http://provider-server:3000/
-      METADATA_FETCH_MODE: ${METADATA_FETCH_MODE:-direct}
+      METADATA_FETCH_MODE: ${METADATA_FETCH_MODE:-smash}
       SMASH_URL: ${SMASH_URL:-http://cardano-smash:3100/api/v1}
     healthcheck:
       test: ['CMD-SHELL', 'curl -s --fail http://localhost:3003/v1.0.0/health']

packages/cardano-services/docker-compose.yml

@@ -25,6 +25,10 @@ services:
     volumes:
       - ./config/network/${NETWORK:-mainnet}:/config
 
+  pg-boss-worker:
+    volumes:
+      - ./environments/.schedules.json:/config/schedules.json
+
   cardano-submit-api:
     volumes:
       - ./config/network/${NETWORK:-mainnet}:/config

packages/cardano-services/environments/.env.local

@@ -1,3 +1,3 @@
 METADATA_FETCH_MODE="smash"
 SMASH_URL="http://cardano-smash:3100/api/v1"
-SCHEDULES="environments/.schedule.local.json"
+SCHEDULES="/config/schedules.json"

packages/cardano-services/environments/.env.mainnet

@@ -1,5 +1,5 @@
 HANDLE_POLICY_IDS=${HANDLE_POLICY_IDS:-f0ff48bbb7bbe9d59a40f1ce90e9e9d0ff5002ec48f232b49ca0fb9a}
 METADATA_FETCH_MODE="smash"
 SMASH_URL="https://smash.cardano-mainnet.iohk.io/api/v1"
-SCHEDULES="environments/.schedule.mainnet.json"
+SCHEDULES="/config/schedules.json"
 TOKEN_METADATA_SERVER_URL="https://tokens.cardano.org"

packages/cardano-services/environments/.env.preprod

@@ -1,4 +1,4 @@
 HANDLE_POLICY_IDS=${HANDLE_POLICY_IDS:-f0ff48bbb7bbe9d59a40f1ce90e9e9d0ff5002ec48f232b49ca0fb9a}
 OGMIOS_PORT=${OGMIOS_PORT:-1339}
 METADATA_FETCH_MODE="smash"
-SCHEDULES="environments/.schedule.preprod.json"
+SCHEDULES="/config/schedules.json"

packages/cardano-services/environments/.env.preview

@@ -1,4 +1,4 @@
 HANDLE_POLICY_IDS=${HANDLE_POLICY_IDS:-f0ff48bbb7bbe9d59a40f1ce90e9e9d0ff5002ec48f232b49ca0fb9a}
 OGMIOS_PORT=${OGMIOS_PORT:-1340}
 METADATA_FETCH_MODE="smash"
-SCHEDULES="environments/.schedule.preview.json"
+SCHEDULES="/config/schedules.json"

packages/cardano-services/environments/README.md

@@ -1,3 +1,5 @@
 # Cardano JS SDK | Docker Composer Environment Variables
 
 This folder holds environment variable files for various Docker composer setups. The `.env` files are referenced in the `../package.json` file.
+`schedules.json` file contains configuration for pg-boss schedules. The file can be copy-pasted separately for each network and each network can use it's own file specified in `.env.*`.
+`schedules.json` file is attached as a volume while running our Docker Compose setup in `../docker-compose.yml`.

packages/cardano-services/test/cli.test.ts

@@ -544,8 +544,8 @@ describe('CLI', () => {
 
     describe('schedules', () => {
       testPgBoss('accepts a valid schedule file', 'pgboss', {
-        args: ['--schedules', 'environments/.schedule.local.json'],
-        env: { SCHEDULES: 'environments/.schedule.local.json' },
+        args: ['--schedules', 'environments/schedules.json'],
+        env: { SCHEDULES: 'environments/schedules.json' },
         expectedArgs: {
           args: { schedules: [{ cron: '0 * * * *', queue: 'pool-delist-schedule', scheduleOptions: {} }] }
         }

packages/e2e/.env.example

@@ -39,6 +39,7 @@ OGMIOS_URL='ws://localhost:1340/'
 STAKE_POOL_PROVIDER_URL='http://localhost:4000/'
 METADATA_FETCH_MODE="smash"
 SMASH_URL="http://cardano-smash:3100/api/v1"
+SCHEDULES="/config/schedules.json"
 
 # Required by test:long-running
 STAKE_POOL_PROJECTOR_URL='http://localhost:4002/'

packages/e2e/docker-compose.yml

@@ -74,6 +74,10 @@ services:
     volumes:
       - ./local-network/config/network:/config
 
+  pg-boss-worker:
+    volumes:
+      - ./schedules.json:/config/schedules.json
+
   cardano-submit-api:
     depends_on:
       local-testnet: