Merge branch 'DefiLlama:master' into master

Author: Brenzee

.github/workflows/build-modules.yml

@@ -0,0 +1,40 @@
+name: Build dimensionModules and upload artifact
+
+on:
+  push:
+    branches: [ "master" ]
+
+jobs:
+  build-and-upload:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - uses: pnpm/action-setup@v4
+        name: Install pnpm
+        with:
+          version: 10
+          run_install: false
+
+      - name: Install Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: 20
+          cache: 'pnpm'
+
+      - name: Install dependencies
+        run: pnpm install
+
+      - name: Run buildImports script
+        run: pnpm run build
+
+      - name: Publish dimensionModules.json as "latest" release
+        uses: ncipollo/release-action@v1
+        with:
+          tag: latest
+          name: Latest dimensionModules
+          artifacts: cli/dimensionModules.json
+          allowUpdates: true

.github/workflows/getFileList.js

@@ -1,4 +1,4 @@
-const ALLOWED_ROOTS = ['volumes', 'dexs', 'options', 'derivatives', 'incentives', 'fees', 'options', 'protocols', 'aggregators','aggregator-derivatives','bridge-aggregators']
+const ALLOWED_ROOTS = ['volumes', 'dexs', 'options', 'derivatives', 'incentives', 'fees', 'options', 'protocols', 'aggregators','aggregator-derivatives','bridge-aggregators', 'open-interest']
 const MODIFIED = parse(process.env.MODIFIED)
 const ADDED = parse(process.env.ADDED)
 const fileSet = new Set();

.github/workflows/test-adapter.yml

@@ -9,8 +9,27 @@ jobs:
         with:
           output: 'json'
           fileOutput: 'json'
-      - name: Check out repository code
-        uses: actions/checkout@v2
+
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - uses: pnpm/action-setup@v4
+        name: Install pnpm
+        with:
+          version: 10
+          run_install: false
+
+      - name: Install Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: 20
+          cache: 'pnpm'
+
+      - name: Install dependencies
+        run: pnpm install
+
       - name: Run changes files through test script
         run: |
           # Store the current commit hash in a variable
@@ -33,8 +52,6 @@ jobs:
             exit 0
           fi
 
-          npm ci
-
           list=$(echo $RUN_FILES | tr  -d '"[]' | tr "," "\n")
 
           for i in ${list}

.github/workflows/ts-check.yml

@@ -6,13 +6,28 @@ jobs:
   ts-check:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
-    - name: Get Node.js
-      uses: actions/setup-node@v1
-      with:
-        node-version: '16'
-    - run: npm ci
-    - name: Checking adapters
-      run: npm run ts-check
-    - name: Checking cli
-      run: npm run ts-check-cli
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - uses: pnpm/action-setup@v4
+        name: Install pnpm
+        with:
+          version: 10
+          run_install: false
+
+      - name: Install Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: 20
+          cache: 'pnpm'
+
+      - name: Install dependencies
+        run: pnpm install
+
+      - name: Checking adapters
+        run: pnpm run ts-check
+        
+      - name: Checking cli
+        run: pnpm run ts-check-cli

.gitignore

@@ -5,4 +5,6 @@ node_modules
 .idea
 yarn.lock
 test.py
-test.js
+test.js
+
+cli/dimensionModules.json

README.md

@@ -2,4 +2,11 @@
 
 Find the instructions to list, write, test and submit an adapter [here](https://docs.llama.fi/list-your-project/other-dashboards)
 
-Example: `yarn test fees bitcoin`
+## Install dependencies 
+`pnpm i`
+
+## test adapter commands
+
+`pnpm test fees bitcoin`
+
+`pnpm test fees bitcoin 2025-10-10` 

adapters/types.ts

@@ -42,6 +42,7 @@ export type FetchOptions = {
   dateString: string,
   preFetchedResults?: any,
   moduleUID: string,  // randomly generated unique identifier for the module, useful for caching
+  startOfDayId?: string, // id used in some subgraphs to identify daily data, usually it's the startOfDay timestamp divided by 86400
 }
 
 export type FetchGetLogsOptions = {
@@ -91,9 +92,16 @@ export enum ProtocolType {
   COLLECTION = 'collection',
 }
 
+export enum Dependencies {
+  DUNE = 'dune',
+  ALLIUM = 'allium'
+}
+
+
 export type AdapterBase = {
   timetravel?: boolean
   isExpensiveAdapter?: boolean,
+  dependencies?: Dependencies[]
   protocolType?: ProtocolType;
   version?: number;
   deadFrom?: string;
@@ -192,6 +200,7 @@ export enum AdapterType {
   DERIVATIVES = 'derivatives',
   OPTIONS = 'options',
   PROTOCOLS = 'protocols',
+  OPEN_INTEREST = 'open-interest',
   // ROYALTIES = 'royalties',
   AGGREGATOR_DERIVATIVES = 'aggregator-derivatives',
   BRIDGE_AGGREGATORS = 'bridge-aggregators',
@@ -218,3 +227,5 @@ export const accumulativeKeySet = new Set([
 export interface IJSON<T> {
   [key: string]: T
 }
+
+export const ADAPTER_TYPES = Object.values(AdapterType).filter((adapterType: any) => adapterType !== AdapterType.PROTOCOLS)

adapters/utils/runAdapter.ts

@@ -75,6 +75,7 @@ export async function setModuleDefaults(module: SimpleAdapter) {
 }
 
 type AdapterRunOptions = {
+  deadChains?: Set<string>, // chains that are dead and should be skipped
   module: SimpleAdapter,
   endTimestamp: number,
   name?: string,
@@ -95,19 +96,33 @@ export default async function runAdapter(options: AdapterRunOptions) {
 
   if (!adapterRunResponseCache[runKey]) adapterRunResponseCache[runKey] = _runAdapter(options)
   else sdk.log(`[Dimensions run] Using cached results for ${runKey}`)
-  return adapterRunResponseCache[runKey]
+  return adapterRunResponseCache[runKey].then((res: any) => clone(res))  // clone the object to avoid accidental mutation of the cached object
+
+  function clone(obj: any) {
+    return JSON.parse(JSON.stringify(obj))
+  }
 }
 
 function getRunKey(options: AdapterRunOptions) {
   let randomUID = options.module._randomUID ?? genUID(10)
   return `${randomUID}-${options.endTimestamp}-${options.withMetadata}`
 }
 
+const startOfDayIdCache: { [key: string]: string } = {}
+
+function getStartOfDayId(timestamp: number): string {
+  if (!startOfDayIdCache[timestamp]) {
+    startOfDayIdCache[timestamp] =  '' + Math.floor(timestamp / 86400)
+  }
+  return startOfDayIdCache[timestamp]
+}
+
 
 async function _runAdapter({
   module, endTimestamp, name,
   isTest = false,
   withMetadata = false,
+  deadChains = new Set(),
 }: AdapterRunOptions) {
   const cleanCurrentDayTimestamp = endTimestamp
   const adapterVersion = module.version
@@ -160,7 +175,7 @@ async function _runAdapter({
   const response = await Promise.all(chains.filter(chain => {
     const res = validStart[chain]?.canRun
     if (isTest && !res) console.log(`Skipping ${chain} because the configured start time is ${new Date(validStart[chain]?.startTimestamp * 1e3).toUTCString()} \n\n`)
-    return validStart[chain]?.canRun
+    return validStart[chain]?.canRun && !deadChains.has(chain)
   }).map(getChainResult))
 
   Object.entries(breakdownByToken).forEach(([chain, data]: any) => {
@@ -227,6 +242,7 @@ async function _runAdapter({
         // if (value === undefined || value === null) throw new Error(`Value: ${value} ${recordType} is undefined or null`)
         if (value instanceof Balances) {
           const { labelBreakdown, usdTvl, usdTokenBalances, rawTokenBalances } = await value.getUSDJSONs()
+          // if (usdTvl > 1e6) value.debug()
           result[recordType] = usdTvl
           breakdownByToken[chain] = breakdownByToken[chain] || {}
           breakdownByToken[chain][recordType] = { usdTvl, usdTokenBalances, rawTokenBalances }
@@ -299,7 +315,13 @@ async function _runAdapter({
     const fromTimestamp = toTimestamp - ONE_DAY_IN_SECONDS
     const getFromBlock = async () => await getBlock(fromTimestamp, chain)
     const getToBlock = async () => await getBlock(toTimestamp, chain, chainBlocks)
+    const problematicChains = new Set(['sei', 'xlayer'])
+
     const getLogs = async ({ target, targets, onlyArgs = true, fromBlock, toBlock, flatten = true, eventAbi, topics, topic, cacheInCloud = false, skipCacheRead = false, entireLog = false, skipIndexer, noTarget, ...rest }: FetchGetLogsOptions) => {
+
+
+      if (problematicChains.has(chain)) throw new Error(`getLogs is disabled for ${chain} chain due to frequent timeouts`)
+
       fromBlock = fromBlock ?? await getFromBlock()
       toBlock = toBlock ?? await getToBlock()
 
@@ -343,6 +365,7 @@ async function _runAdapter({
       getEndBlock,
       dateString: getDateString(startOfDay),
       moduleUID,
+      startOfDayId: getStartOfDayId(startOfDay),
     }
   }
 
@@ -431,7 +454,7 @@ function addMissingMetrics(chain: string, result: any) {
   if (result.dailyFees && result.dailyFees instanceof Balances && result.dailyFees.hasBreakdownBalances()) {
 
     // if we have supplySideRevenue but missing revenue, add revenue = fees - supplySideRevenue
-    if (result.dailySupplySideRevenue && !result.dailyrevenue) {
+    if (result.dailySupplySideRevenue && !result.dailyRevenue) {
       result.dailyRevenue = createBalanceFrom({ chain, timestamp: result.timestamp, amount: result.dailyFees })
       subtractBalance({ balance: result.dailyRevenue, amount: result.dailySupplySideRevenue })
     }

aggregator-derivatives/perpie/index.ts

@@ -1,4 +1,5 @@
 import {
+  Dependencies,
   Fetch,
   FetchOptions,
   FetchResult,
@@ -22,15 +23,15 @@ const chainsMap: Record<string, string> = {
 
 const fetchVolumeAndFees: (chain: string) => FetchV2 =
   (chain: string) =>
-  async (options: FetchOptions): Promise<FetchResult> => {
-    chain;
+    async (options: FetchOptions): Promise<FetchResult> => {
+      chain;
 
-    const daytime = new Date(options.startOfDay * 1000).toISOString();
+      const daytime = new Date(options.startOfDay * 1000).toISOString();
 
-    // throw new Error('Dune query is broken, fix it by turning adapter on chain')
-    // https://dune.com/queries/3855069
-    let data = (
-      await queryDuneSql(options, `
+      // throw new Error('Dune query is broken, fix it by turning adapter on chain')
+      // https://dune.com/queries/3855069
+      let data = (
+        await queryDuneSql(options, `
         WITH
           PERPIE_TRADES_DAILY AS (
             SELECT
@@ -86,33 +87,35 @@ const fetchVolumeAndFees: (chain: string) => FetchV2 =
           total_fees
         `
         )
-    )[0] as StatRow;
+      )[0] as StatRow;
 
-    return {
-      dailyVolume: data.volume_24hr || 0,
-      dailyRevenue: data.fees_24hr || 0,
+      return {
+        dailyVolume: data.volume_24hr || 0,
+        dailyRevenue: data.fees_24hr || 0,
+      };
     };
-  };
 
 const fetchAll: (chain: string) => Fetch =
   (chain: string) =>
-  async (_a: any, _t: any ,options: FetchOptions): Promise<FetchResult> => {
-    const volumeAndFees = await fetchVolumeAndFees(chain)(options);
-    return { ...volumeAndFees } as FetchResult;
-  };
+    async (_a: any, _t: any, options: FetchOptions): Promise<FetchResult> => {
+      const volumeAndFees = await fetchVolumeAndFees(chain)(options);
+      return { ...volumeAndFees } as FetchResult;
+    };
+
 const adapter: SimpleAdapter = {
   deadFrom: '2024-11-24',
   isExpensiveAdapter: true,
+  dependencies: [Dependencies.DUNE],
   adapter: {
-      ...Object.values(chainsMap).reduce((acc, chain) => {
-        return {
-          ...acc,
-          [(chainsMap as any)[chain] || chain]: {
-            start: arbitrumStartTimestamp,
-            fetch: fetchAll(chain),
-          },
-        };
-      }, {}),
+    ...Object.values(chainsMap).reduce((acc, chain) => {
+      return {
+        ...acc,
+        [(chainsMap as any)[chain] || chain]: {
+          start: arbitrumStartTimestamp,
+          fetch: fetchAll(chain),
+        },
+      };
+    }, {}),
   },
 };
 

aggregator-derivatives/rage-trade/index.ts

@@ -18,6 +18,7 @@ const fetch = async (timestamp: number, _b:any, options: FetchOptions): Promise<
 }
 
 const adapter: SimpleAdapter = {
+  deadFrom: '2025-10-01', // Rage Trade is sunnted
   adapter: {
     [CHAIN.ARBITRUM]: {
       fetch,