Merge pull request #47 from everclearorg/fix/flaky-actions

fix: flaky install

Author: LayneHaber

package.json

@@ -45,11 +45,11 @@
     "eslint-plugin-prettier": "5.2.1",
     "ethers": "5.7.2",
     "husky": "9.1.7",
-    "nyc": "^17.1.0",
+    "nyc": "17.1.0",
     "prettier": "3.4.2",
     "rimraf": "6.0.1",
     "sort-package-json": "2.12.0",
-    "tsc-alias": "^1.8.10",
+    "tsc-alias": "1.8.10",
     "typescript": "5.7.2"
   },
   "packageManager": "yarn@3.3.1"

packages/adapters/cache/package.json

@@ -28,13 +28,13 @@
         "ioredis": "5.5.0"
     },
     "devDependencies": {
-        "@types/jest": "^29.5.12",
+        "@types/jest": "29.5.12",
         "@types/node": "20.17.12",
         "eslint": "9.17.0",
-        "jest": "^29.7.0",
+        "jest": "29.7.0",
         "rimraf": "6.0.1",
         "sort-package-json": "2.12.0",
-        "ts-jest": "^29.1.2",
+        "ts-jest": "29.1.2",
         "typescript": "5.7.2"
     }
 }

packages/adapters/everclear/jest.config.js

@@ -0,0 +1,9 @@
+module.exports = {
+    preset: 'ts-jest',
+    testEnvironment: 'node',
+    testMatch: ['<rootDir>/test/**/*.spec.ts'],
+    moduleFileExtensions: ['ts', 'js'],
+    transform: {
+        '^.+\\.ts$': 'ts-jest'
+    }
+}; 

packages/adapters/everclear/package.json

@@ -19,18 +19,21 @@
     "lint:package": "sort-package-json",
     "lint:ts": "eslint ./src",
     "purge": "yarn clean && rimraf ./coverage ./node_modules",
-    "test": "",
-    "test:unit": ""
+    "test": "yarn test:unit",
+    "test:unit": "jest"
   },
   "dependencies": {
     "@mark/core": "workspace:*",
     "@mark/logger": "workspace:*"
   },
   "devDependencies": {
+    "@types/jest": "29.5.0",
     "@types/node": "20.17.12",
     "eslint": "9.17.0",
+    "jest": "29.5.0",
     "rimraf": "6.0.1",
     "sort-package-json": "2.12.0",
+    "ts-jest": "29.1.0",
     "typescript": "5.7.2"
   }
 }

packages/adapters/everclear/test/index.spec.ts

@@ -0,0 +1,36 @@
+import { EverclearAdapter } from "../src";
+import { Logger } from '@mark/logger';
+
+// mock logger
+jest.mock('@mark/logger', () => {
+    return {
+        jsonifyError: jest.fn(),
+        Logger: jest.fn().mockImplementation(() => ({
+            info: jest.fn(),
+            error: jest.fn(),
+            warn: jest.fn(),
+            debug: jest.fn(),
+            logger: {}
+        }))
+    };
+});
+
+describe.skip('EverclearAdapter', () => {
+    const apiUrl = 'https://local.everclear.org';
+
+    let adapter: EverclearAdapter;
+    let logger: Logger;
+
+    beforeEach(() => {
+        logger = new Logger({ service: 'test-service' });
+        adapter = new EverclearAdapter(apiUrl, logger)
+    })
+
+    describe('getMinAmounts', () => {
+        it('should handle undefined cases', async () => {
+            const invoiceId = '0xinvoice';
+            const response = await adapter.getMinAmounts(invoiceId);
+            expect(response).toBeDefined;
+        })
+    })
+})

packages/adapters/everclear/tsconfig.json

@@ -8,5 +8,8 @@
   },
   "include": ["src/**/*"],
   "exclude": ["dist", "node_modules", "**/*.spec.ts"],
-  "references": [{ "path": "../../core" }, { "path": "../logger" }]
+  "references": [
+    { "path": "../../core" },
+    { "path": "../logger" }
+  ]
 } 

packages/poller/package.json

@@ -33,10 +33,10 @@
     "viem": "2.22.8"
   },
   "devDependencies": {
-    "@types/aws-lambda": "^8.10.147",
-    "@types/chai": "^5.0.1",
+    "@types/aws-lambda": "8.10.147",
+    "@types/chai": "5.0.1",
     "@types/chai-as-promised": "7.1.1",
-    "@types/mocha": "^10.0.10",
+    "@types/mocha": "10.0.10",
     "@types/node": "20.17.12",
     "@types/sinon": "17.0.3",
     "chai": "4.2.0",
@@ -48,7 +48,7 @@
     "sinon": "17.0.1",
     "ts-node": "10.9.2",
     "ts-node-dev": "2.0.0",
-    "tsc-alias": "^1.8.10",
+    "tsc-alias": "1.8.10",
     "tsconfig-paths": "4.2.0",
     "typescript": "5.7.2"
   }

packages/poller/src/invoice/processInvoices.ts

@@ -172,13 +172,25 @@ export async function processInvoices({
       }
 
       // Get the minimum amounts for invoice
-      const { minAmounts } = await everclear.getMinAmounts(invoiceId);
-      logger.debug('Got minimum amounts for invoice', {
-        requestId,
-        invoiceId,
-        invoice,
-        minAmounts,
-      });
+      let minAmounts: Record<string, string>;
+      try {
+        const { minAmounts: _minAmounts } = await everclear.getMinAmounts(invoiceId);
+        minAmounts = _minAmounts;
+        logger.debug('Got minimum amounts for invoice', {
+          requestId,
+          invoiceId,
+          invoice,
+          minAmounts,
+        });
+      } catch (e) {
+        logger.error('Failed to get min amounts for invoice', {
+          requestId,
+          invoiceId,
+          invoice,
+          error: jsonifyError(e),
+        });
+        minAmounts = Object.fromEntries(invoice.destinations.map((d) => [d, '0']));
+      }
 
       // For each invoice destination
       for (const [destination, minAmount] of Object.entries(minAmounts)) {