Update subgraph url

.github/workflows/checks.yml

@@ -4,6 +4,7 @@ on:
 jobs:
   check-all:
     runs-on: ubuntu-latest
+    timeout-minutes: 30
     steps:
       - name: Checkout repo
         uses: actions/checkout@v4

package.json

@@ -60,5 +60,8 @@
       "main"
     ]
   },
-  "packageManager": "[email protected]"
+  "packageManager": "[email protected]",
+  "engines": {
+    "node": ">=20"
+  }
 }

packages/sdk/CHANGELOG.md

@@ -2,6 +2,14 @@
 
 ## SDK
 
+### Fixed
+
+- Mainnet subgraph ID now points to updated, L2 based subgraph
+
+# 3.1.0
+
+## SDK
+
 ### Added
 
 - `viem` version up to `2.0.6`

packages/sdk/jest.config.ts

@@ -6,7 +6,7 @@ const jestConfig: JestConfigWithTsJest = {
   // fix for leftover handles when running locally on macos
   forceExit: true,
   preset: 'ts-jest',
-  verbose: true,
+  verbose: false,
   extensionsToTreatAsEsm: ['.ts'],
   moduleNameMapper: {
     '^(\\.{1,2}/.*)\\.js$': '$1',
@@ -23,7 +23,7 @@ const jestConfig: JestConfigWithTsJest = {
   maxWorkers: 1,
   globalSetup: '<rootDir>/tests/global-setup.cjs',
   globalTeardown: '<rootDir>/tests/global-teardown.cjs',
-  testTimeout: 300_000,
+  testTimeout: 60_000,
 };
 
 export default jestConfig;

packages/sdk/package.json

@@ -131,9 +131,6 @@
     "access": "public",
     "provenance": true
   },
-  "engines": {
-    "node": ">=20"
-  },
   "scripts": {
     "build": "yarn clean && yarn build:cjs && yarn build:esm && yarn build:types",
     "types": "tsc --noEmit",
@@ -154,14 +151,12 @@
   "devDependencies": {
     "@jest/globals": "^29.7.0",
     "@types/fs-extra": "^11.0.1",
-    "@types/node-fetch": "^2.6.7",
     "dotenv": "^16.3.1",
     "fs-extra": "^11.1.1",
-    "ganache": "^7.9.1",
+    "ganache": "^7.9.2",
     "jest": "^29.7.0",
-    "node-fetch": "^2.6.7",
     "rimraf": "^5.0.1",
-    "ts-jest": "^29.1.1",
+    "ts-jest": "^29.1.2",
     "typescript": "5.1.6"
   }
 }

packages/sdk/src/common/constants.ts

@@ -30,7 +30,7 @@ export const LIDO_LOCATOR_BY_CHAIN: {
 export const SUBRGRAPH_ID_BY_CHAIN: {
   [key in CHAINS]: string | null;
 } = {
-  [CHAINS.Mainnet]: 'HXfMc1jPHfFQoccWd7VMv66km75FoxVHDMvsJj5vG5vf',
+  [CHAINS.Mainnet]: 'Sxx812XgeKyzQPaBpR5YZWmGV5fZuBaPdh7DFhzSwiQ',
   [CHAINS.Goerli]: 'QmeDfGTuNbSoZ71zi3Ch4WNRbzALfiFPnJMYUFPinLiFNa',
   [CHAINS.Holesky]: null,
 };

packages/sdk/tests/global-setup.cjs

@@ -1,17 +1,8 @@
 const path = require('path');
-const fetch = require('node-fetch');
 const dotenv = require('dotenv');
 const ganache = require('ganache');
 
 module.exports = async function () {
-  if (!globalThis.fetch) {
-    const g = globalThis;
-    g.fetch = fetch.default;
-    g.Headers = fetch.Headers;
-    g.Request = fetch.Request;
-    g.Response = fetch.Response;
-  }
-
   dotenv.config({
     path: path.resolve(process.cwd(), '.env'),
   });
@@ -22,12 +13,38 @@ module.exports = async function () {
   const ganacheProvider = ganache.provider({
     fork: { url: rpcUrl },
     logging: { quiet: true },
-    chain: { chainId, asyncRequestProcessing: false },
+    chain: { chainId, asyncRequestProcessing: true },
   });
 
   console.debug('\nInitializing ganache provider...');
   await ganacheProvider.initialize();
-  console.debug('Initialized ganache provider');
+  console.debug('Initialized ganache provider OK');
+
+  console.debug('Testing direct RPC provider...');
+  const { result } = await fetch(rpcUrl, {
+    method: 'POST',
+    body: JSON.stringify({
+      method: 'eth_chainId',
+      params: [],
+    }),
+    headers: {
+      'Content-Type': 'application/json',
+    },
+  }).then((response) => response.json());
+  if (Number(result) !== chainId) {
+    throw new Error(`Invalid direct RPC provider response: ${result}`);
+  }
+  console.debug('Direct RPC provider OK');
+
+  console.debug('Testing ganache fork RPC provider...');
+  const testRequest = await ganacheProvider.request({
+    method: 'eth_chainId',
+    params: [],
+  });
+  if (Number(testRequest) !== chainId) {
+    throw new Error(`Invalid ganache response: ${testRequest}`);
+  }
+  console.debug('Ganache fork RPC provider OK');
 
   globalThis.__ganache_provider__ = ganacheProvider;
 };

packages/sdk/tests/utils/test-spending.ts

@@ -3,7 +3,7 @@ import { useTestsEnvs } from './fixtures/use-test-envs.js';
 
 const { skipSpendingTests } = useTestsEnvs();
 
-export const SPENDING_TIMEOUT = 1000 * 60 * 5;
+export const SPENDING_TIMEOUT = 120_000;
 
 // Pollute test.skip with missing fields so that it can be stand in for test
 (test.skip as any).concurrent = xtest;