Merge pull request #196 from Oluwatomilola/circuit

feat: Fix for Circuit #133

Author: DeFiVC

src/stellar/client.ts

@@ -33,10 +33,12 @@ export class StellarClient {
   /** Load account record from Horizon. */
   async getAccount(publicKey: string): Promise<StellarSdk.Horizon.AccountResponse> {
     try {
-      return await circuitBreakerExecute(() =>
-        stellarRetry.execute(() =>
-          withTimeout(this.horizon.loadAccount(publicKey), READ_TIMEOUT_MS)
-        )
+      return await circuitBreakerExecute(
+        () =>
+          stellarRetry.execute(() =>
+            withTimeout(this.horizon.loadAccount(publicKey), READ_TIMEOUT_MS)
+          ),
+        "read"
       );
     } catch (err) {
       logger.error({ err, publicKey }, "Failed to load Stellar account");
@@ -49,10 +51,12 @@ export class StellarClient {
     txEnvelope: StellarSdk.Transaction | StellarSdk.FeeBumpTransaction
   ): Promise<StellarSdk.Horizon.HorizonApi.SubmitTransactionResponse> {
     try {
-      const result = await circuitBreakerExecute(() =>
-        stellarRetry.execute(() =>
-          withTimeout(this.horizon.submitTransaction(txEnvelope), WRITE_TIMEOUT_MS)
-        )
+      const result = await circuitBreakerExecute(
+        () =>
+          stellarRetry.execute(() =>
+            withTimeout(this.horizon.submitTransaction(txEnvelope), WRITE_TIMEOUT_MS)
+          ),
+        "write"
       );
       logger.info({ hash: result.hash }, "Transaction submitted successfully");
       return result;

src/stellar/resilience.ts

@@ -10,18 +10,31 @@ import {
 
 export const stellarRetry = createTransientRetryPolicy("Stellar");
 
-const stellarBreaker = createCircuitBreaker({ label: "Stellar" });
+export type StellarOperation = "read" | "write";
 
-export function getCircuitState(): CircuitState {
-  return stellarBreaker.getState();
+const stellarReadBreaker = createCircuitBreaker({ label: "StellarRead" });
+const stellarWriteBreaker = createCircuitBreaker({ label: "StellarWrite" });
+
+function getBreaker(operation: StellarOperation = "read") {
+  return operation === "write" ? stellarWriteBreaker : stellarReadBreaker;
+}
+
+export function getCircuitState(operation: StellarOperation = "read"): CircuitState {
+  return getBreaker(operation).getState();
 }
 
-export function resetCircuitBreaker(): void {
-  stellarBreaker.reset();
+export function resetCircuitBreaker(operation?: StellarOperation): void {
+  if (operation) {
+    getBreaker(operation).reset();
+    return;
+  }
+
+  stellarReadBreaker.reset();
+  stellarWriteBreaker.reset();
 }
 
-export function circuitBreakerExecute<T>(fn: () => Promise<T>): Promise<T> {
-  return stellarBreaker.execute(fn);
+export function circuitBreakerExecute<T>(fn: () => Promise<T>, operation: StellarOperation = "read"): Promise<T> {
+  return getBreaker(operation).execute(fn);
 }
 
 export { withTimeout, isCircuitBreakerError, CircuitState, CircuitBreakerOpenError, TimeoutError };

tests/unit/services/resilience.test.ts

@@ -96,6 +96,21 @@ describe("Stellar Resilience", () => {
         vi.useRealTimers();
       }
     });
+
+    it("should isolate breaker state between read and write operations", async () => {
+      const readFailure = vi.fn().mockRejectedValue(new Error("ECONNREFUSED"));
+      const writeSuccess = vi.fn().mockResolvedValue("write-ok");
+
+      for (let i = 0; i < 5; i++) {
+        try {
+          await circuitBreakerExecute(readFailure, "read");
+        } catch {
+          // expected
+        }
+      }
+
+      await expect(circuitBreakerExecute(writeSuccess, "write")).resolves.toBe("write-ok");
+    });
   });
 
   describe("Timeout", () => {

tests/unit/stellar/client.test.ts

@@ -1,5 +1,13 @@
 import { describe, it, expect, vi, beforeEach } from "vitest";
 
+const { mockHorizon, mockSoroban } = vi.hoisted(() => ({
+  mockHorizon: {
+    loadAccount: vi.fn(),
+    submitTransaction: vi.fn(),
+  },
+  mockSoroban: {},
+}));
+
 vi.mock("../../../src/config/stellar.js", () => ({
   getHorizonServer: vi.fn(() => mockHorizon),
   getSorobanServer: vi.fn(() => mockSoroban),
@@ -14,17 +22,10 @@ vi.mock("../../../src/stellar/resilience.js", () => ({
   stellarRetry: {
     execute: vi.fn((fn) => fn()),
   },
-  circuitBreakerExecute: vi.fn((fn) => fn()),
+  circuitBreakerExecute: vi.fn((fn, _operation) => fn()),
   withTimeout: vi.fn((promise) => promise),
 }));
 
-const mockHorizon = {
-  loadAccount: vi.fn(),
-  submitTransaction: vi.fn(),
-};
-
-const mockSoroban = {};
-
 import { StellarClient } from "../../../src/stellar/client.js";
 import { StellarError } from "../../../src/utils/errors.js";