@wopr-network/platform-core 1.49.3 → 1.49.4

package/dist/billing/crypto/__tests__/key-server.test.js

@@ -218,6 +218,59 @@ describe("key-server routes", () => {
         expect(callCount).toBe(2);
         expect(body.index).toBe(1); // skipped index 0
     });
+    it("POST /address retries on Drizzle-wrapped collision error (cause.code)", async () => {
+        // Drizzle wraps PG errors: err.code is undefined, err.cause.code has "23505"
+        const pgError = Object.assign(new Error("unique_violation"), { code: "23505" });
+        const drizzleError = Object.assign(new Error("DrizzleQueryError"), { cause: pgError });
+        let callCount = 0;
+        const mockMethod = {
+            id: "eth",
+            type: "native",
+            token: "ETH",
+            chain: "base",
+            xpub: "xpub6CUGRUonZSQ4TWtTMmzXdrXDtypWKiKrhko4egpiMZbpiaQL2jkwSB1icqYh2cfDfVxdx4df189oLKnC5fSwqPfgyP3hooxujYzAu3fDVmz",
+            nextIndex: 0,
+            decimals: 18,
+            addressType: "evm",
+            confirmations: 1,
+        };
+        const db = {
+            update: vi.fn().mockImplementation(() => ({
+                set: vi.fn().mockReturnValue({
+                    where: vi.fn().mockReturnValue({
+                        returning: vi.fn().mockImplementation(() => {
+                            callCount++;
+                            return Promise.resolve([{ ...mockMethod, nextIndex: callCount }]);
+                        }),
+                    }),
+                }),
+            })),
+            insert: vi.fn().mockImplementation(() => ({
+                values: vi.fn().mockImplementation(() => {
+                    if (callCount <= 1)
+                        throw drizzleError;
+                    return { onConflictDoNothing: vi.fn().mockResolvedValue({ rowCount: 1 }) };
+                }),
+            })),
+            select: vi.fn().mockReturnValue({
+                from: vi.fn().mockReturnValue({ where: vi.fn().mockResolvedValue([]) }),
+            }),
+            transaction: vi.fn().mockImplementation(async (fn) => fn(db)),
+        };
+        const deps = mockDeps();
+        deps.db = db;
+        const app = createKeyServerApp(deps);
+        const res = await app.request("/address", {
+            method: "POST",
+            headers: { "Content-Type": "application/json" },
+            body: JSON.stringify({ chain: "eth" }),
+        });
+        expect(res.status).toBe(201);
+        const body = await res.json();
+        expect(body.address).toMatch(/^0x/);
+        expect(callCount).toBe(2);
+        expect(body.index).toBe(1);
+    });
     it("POST /charges creates a charge", async () => {
         const app = createKeyServerApp(mockDeps());
         const res = await app.request("/charges", {

package/dist/billing/crypto/key-server.js

@@ -71,7 +71,8 @@ async function deriveNextAddress(db, chainId, tenantId) {
             return { address, index, chain: method.chain, token: method.token };
         }
         catch (err) {
-            const code = err.code;
+            // Drizzle wraps PG errors — check both top-level and cause for the constraint violation code
+            const code = err.code ?? err.cause?.code;
             if (code === "23505" && attempt < maxRetries)
                 continue; // collision — index already advanced, retry
             throw err;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wopr-network/platform-core",
-  "version": "1.49.3",
+  "version": "1.49.4",
   "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/billing/crypto/__tests__/key-server.test.ts

@@ -239,6 +239,64 @@ describe("key-server routes", () => {
     expect(body.index).toBe(1); // skipped index 0
   });
 
+  it("POST /address retries on Drizzle-wrapped collision error (cause.code)", async () => {
+    // Drizzle wraps PG errors: err.code is undefined, err.cause.code has "23505"
+    const pgError = Object.assign(new Error("unique_violation"), { code: "23505" });
+    const drizzleError = Object.assign(new Error("DrizzleQueryError"), { cause: pgError });
+    let callCount = 0;
+
+    const mockMethod = {
+      id: "eth",
+      type: "native",
+      token: "ETH",
+      chain: "base",
+      xpub: "xpub6CUGRUonZSQ4TWtTMmzXdrXDtypWKiKrhko4egpiMZbpiaQL2jkwSB1icqYh2cfDfVxdx4df189oLKnC5fSwqPfgyP3hooxujYzAu3fDVmz",
+      nextIndex: 0,
+      decimals: 18,
+      addressType: "evm",
+      confirmations: 1,
+    };
+
+    const db = {
+      update: vi.fn().mockImplementation(() => ({
+        set: vi.fn().mockReturnValue({
+          where: vi.fn().mockReturnValue({
+            returning: vi.fn().mockImplementation(() => {
+              callCount++;
+              return Promise.resolve([{ ...mockMethod, nextIndex: callCount }]);
+            }),
+          }),
+        }),
+      })),
+      insert: vi.fn().mockImplementation(() => ({
+        values: vi.fn().mockImplementation(() => {
+          if (callCount <= 1) throw drizzleError;
+          return { onConflictDoNothing: vi.fn().mockResolvedValue({ rowCount: 1 }) };
+        }),
+      })),
+      select: vi.fn().mockReturnValue({
+        from: vi.fn().mockReturnValue({ where: vi.fn().mockResolvedValue([]) }),
+      }),
+      transaction: vi.fn().mockImplementation(async (fn: (tx: unknown) => unknown) => fn(db)),
+    };
+
+    const deps = mockDeps();
+    (deps as unknown as { db: unknown }).db = db;
+    const app = createKeyServerApp(deps);
+
+    const res = await app.request("/address", {
+      method: "POST",
+      headers: { "Content-Type": "application/json" },
+      body: JSON.stringify({ chain: "eth" }),
+    });
+
+    expect(res.status).toBe(201);
+    const body = await res.json();
+    expect(body.address).toMatch(/^0x/);
+    expect(callCount).toBe(2);
+    expect(body.index).toBe(1);
+  });
+
   it("POST /charges creates a charge", async () => {
     const app = createKeyServerApp(mockDeps());
     const res = await app.request("/charges", {

package/src/billing/crypto/key-server.ts

@@ -98,7 +98,8 @@ async function deriveNextAddress(
       });
       return { address, index, chain: method.chain, token: method.token };
     } catch (err: unknown) {
-      const code = (err as { code?: string }).code;
+      // Drizzle wraps PG errors — check both top-level and cause for the constraint violation code
+      const code = (err as { code?: string }).code ?? (err as { cause?: { code?: string } }).cause?.code;
       if (code === "23505" && attempt < maxRetries) continue; // collision — index already advanced, retry
       throw err;
     }