fix: use same ref of incentivesVesterConfig

Author: Alex Stelea

apps/workers/src/helpers/handleExit.ts

@@ -1,9 +1,11 @@
-import { Cause, Exit } from 'effect';
+import { workerRuntime } from 'api/incentives/snapshot/v2/runtime';
+import { Cause, Effect, Exit } from 'effect';
 
 export const handleExit = (exit: Exit.Exit<any, any>) => {
   Exit.match(exit, {
     onSuccess: (value) => value,
     onFailure: (cause) => {
+      workerRuntime.runSync(Effect.logError(cause));
       if (Cause.isFailType(cause)) {
         const enhancedError = new Error(cause.error._tag);
         enhancedError.stack = Cause.pretty(cause);
@@ -14,7 +16,6 @@ export const handleExit = (exit: Exit.Exit<any, any>) => {
       const enhancedError = new Error(cause._tag ?? 'unhandled error');
       enhancedError.cause = cause._tag;
       enhancedError.stack = Cause.pretty(cause);
-      console.error(cause);
       throw enhancedError;
     },
   });

apps/workers/src/queues/season-reward-claim/queue.ts

@@ -1,4 +1,5 @@
 import type { SeasonRewardWorkerInput } from 'api/incentives/season-reward/seasonRewardWorker';
+import { workerRuntime } from 'api/incentives/snapshot/v2/runtime';
 import { Effect } from 'effect';
 import { redisClient } from '../../redis';
 import { createQueue } from '../createQueue';
@@ -13,16 +14,14 @@ export const seasonRewardClaimQueue = createQueue<
   redisClient,
   worker: seasonRewardClaimWorker,
   onError: async (job, error) => {
-    Effect.runSync(
-      Effect.gen(function* () {
-        yield* Effect.logError({
-          jobId: job?.id,
-          jobName: job?.name,
-          input: job?.data,
-          error: error.message,
-          stack: error.stack,
-          failedReason: error.cause,
-        });
+    workerRuntime.runSync(
+      Effect.logError({
+        jobId: job?.id,
+        jobName: job?.name,
+        input: job?.data,
+        error: error.message,
+        stack: error.stack,
+        failedReason: error.cause,
       }),
     );
   },

packages/api/src/incentives/season-reward/incentives-vester/incentivesVester.ts

@@ -337,7 +337,7 @@ export class IncentivesVester extends Effect.Service<IncentivesVester>()(
   },
 ) {
   static MainnetLive = IncentivesVester.Default.pipe(
-    Layer.provide(
+    Layer.provideMerge(
       Layer.mergeAll(
         Signer.VaultLive,
         Layer.effect(

packages/api/src/incentives/season-reward/seasonRewardWorker.spec.ts

@@ -8,6 +8,7 @@ import { DisableTestClock } from '../../test-helpers/disableTestClock';
 import { truncateTables } from '../../test-helpers/truncateTables';
 import { AccountAddress, Amount } from '../account-balance/v2/schemas';
 import { DbService } from '../db/dbClient';
+import { SeasonService } from '../season/season';
 import { Signer } from '../transaction-intent/signer/signer';
 import { IncentivesVesterConfig } from './incentives-vester/config';
 import { IncentivesVester } from './incentives-vester/incentivesVester';
@@ -69,20 +70,26 @@ const testSetup = Effect.gen(function* () {
   return result;
 }).pipe(Effect.tapError(Effect.logError), Effect.provide(DbService.Default));
 
+const IncentivesVesterTestLive = IncentivesVester.Default.pipe(
+  Layer.provideMerge(
+    Layer.mergeAll(
+      Signer.VaultLive,
+      Layer.effect(
+        IncentivesVesterConfig,
+        IncentivesVesterConfig.StokenetConfig,
+      ),
+    ),
+  ),
+);
+
 layer(
   SeasonRewardWorker.DefaultWithoutDependencies.pipe(
     Layer.provide(
       Layer.mergeAll(
         SeasonRewardClaim.Default,
-        IncentivesVester.Default.pipe(
-          Layer.provide(
-            Layer.effect(
-              IncentivesVesterConfig,
-              IncentivesVesterConfig.StokenetConfig,
-            ),
-          ),
-        ),
+        IncentivesVesterTestLive,
         RedisLockTest,
+        SeasonService.Default,
       ),
     ),
   ),

packages/api/src/incentives/season-reward/seasonRewardWorker.ts

@@ -1,4 +1,4 @@
-import { Data, Duration, Effect, Layer, Option, Ref, Schema } from 'effect';
+import { Data, Duration, Effect, Option, Ref, Schema } from 'effect';
 import {
   AccountAddress,
   Amount,
@@ -43,10 +43,6 @@ export class SeasonRewardWorker extends Effect.Service<SeasonRewardWorker>()(
       SeasonRewardClaim.Default,
       RedisLock.Default,
       SeasonService.Default,
-      Layer.effect(
-        IncentivesVesterConfig,
-        IncentivesVesterConfig.MainnetConfig,
-      ),
     ],
     effect: Effect.gen(function* () {
       const incentivesVester = yield* IncentivesVester;

packages/api/src/incentives/transaction-intent/signer/vault.ts

@@ -1,14 +1,10 @@
-import {
-  FetchHttpClient,
-  FileSystem,
-  HttpBody,
-  HttpClient,
-} from '@effect/platform';
-import { NodeFileSystem } from '@effect/platform-node';
+import { FileSystem, HttpBody, HttpClient } from '@effect/platform';
+import { NodeFileSystem, NodeHttpClient } from '@effect/platform-node';
 import {
   Array as A,
   Config,
   Effect,
+  Layer,
   Option,
   ParseResult,
   pipe,
@@ -114,8 +110,16 @@ const getVaultToken = (fs: FileSystem.FileSystem) =>
     return yield* Config.string('VAULT_TOKEN');
   });
 
+const NodeHttpClientLive = NodeHttpClient.layerWithoutAgent.pipe(
+  Layer.provide(
+    NodeHttpClient.makeAgentLayer({
+      rejectUnauthorized: false, // Allow self-signed certificates for internal cluster traffic
+    }),
+  ),
+);
+
 export class Vault extends Effect.Service<Vault>()('Vault', {
-  dependencies: [FetchHttpClient.layer, NodeFileSystem.layer],
+  dependencies: [NodeHttpClientLive, NodeFileSystem.layer],
   effect: Effect.gen(function* () {
     const keyName = yield* Config.string('VAULT_KEY_NAME').pipe(
       Config.withDefault('xrd-distribution'),
@@ -139,7 +143,9 @@ export class Vault extends Effect.Service<Vault>()('Vault', {
             },
           })
           .pipe(
+            Effect.tapError(Effect.logError),
             Effect.flatMap((response) => response.json),
+            Effect.tap((response) => Effect.log(response)),
             Effect.flatMap(Schema.decodeUnknown(PublicKeyResponseSchema)),
           );
       }).pipe(Effect.orDie);
@@ -164,6 +170,7 @@ export class Vault extends Effect.Service<Vault>()('Vault', {
           })
           .pipe(
             Effect.flatMap((response) => response.json),
+            Effect.tap((response) => Effect.log(response)),
             Effect.flatMap(Schema.decodeUnknown(SignResponseSchema)),
           );