Update from upstream

.github/workflows/commentResult.js

@@ -9,19 +9,24 @@ async function main() {
     const [_, adapterName] = adapterNameKey.split('@')
 
 
-    const errorString = '------ ERROR ------';
-    const summaryIndex = file.indexOf('_______________________________________');
+    const errorString = 'ERROR';
+    const summaryIndex = file.indexOf('---------------------------------------------------');
     const errorIndex = file.indexOf(errorString);
     let body;
 
     if (summaryIndex != -1) {
-        body = `The ${adapterName} adapter exports: 
-        \n \n ${file.substring(summaryIndex).replaceAll('\n', '\n    ')}`;
+        body = `The ${adapterName} adapter exports:
+        \n \n ${file.replaceAll('\n', '\n    ')}`;
+        console.info(`Posting comment:\n${body}`)
     } else if (errorIndex != -1) {
-        body = `Error while running adapter ${adapterName} adapter: 
+        body = `Error while running adapter ${adapterName} adapter:
         \n \n ${file.split(errorString)[1].replaceAll('\n', '\n    ')}`;
-    } else
+        console.info(`Posting comment:\n${body}`)
+    } else {
+        console.info(`No error or summary found in log file`);
         return;
+    }
+
 
     console.info(`Posting comment:\n${body}`)
 
@@ -37,4 +42,4 @@ async function main() {
 function translate(input) {
     return input ? translate(input.substring(1)) + input[0] : input;
 };
-main();
+main();

.github/workflows/getFileList.js

@@ -1,4 +1,4 @@
-const ALLOWED_ROOTS = ['volumes', 'dexs', 'options', 'derivatives', 'incentives', 'fees', 'options', 'protocols']
+const ALLOWED_ROOTS = ['volumes', 'dexs', 'options', 'derivatives', 'incentives', 'fees', 'options', 'protocols', 'aggregators','aggregator-derivatives']
 const MODIFIED = parse(process.env.MODIFIED)
 const ADDED = parse(process.env.ADDED)
 const fileSet = new Set();
@@ -13,4 +13,4 @@ console.log(JSON.stringify([...fileSet]))
 
 function parse(data) {
   return data.replace('[', '').replace(']', '').split(',')
-}
+}

.github/workflows/test-adapter.yml

@@ -13,6 +13,15 @@ jobs:
         uses: actions/checkout@v2
       - name: Run changes files through test script
         run: |
+          # Store the current commit hash in a variable
+          current_commit=$(git rev-parse HEAD)
+
+          # Checkout to master to check if new adapters files are of v2
+          git fetch origin master:master
+
+          # Checkout back to the original commit
+          git checkout $current_commit
+
           RUN_FILES=$(
             MODIFIED=${{ steps.file_changes.outputs.files_modified}} \
             ADDED=${{ steps.file_changes.outputs.files_added}} \
@@ -24,21 +33,20 @@ jobs:
             exit 0
           fi
 
-          yarn install --production
-          yarn upgrade @defillama/sdk
+          npm ci
 
           list=$(echo $RUN_FILES | tr  -d '"[]' | tr "," "\n")
 
           for i in ${list}
-          do 
-            { 
+          do
+            {
               IFS='@' read -r -a array <<< "$i"
-              yarn test ${array[0]} ${array[1]} 2>&1 | tee output.txt
+              npm run test ${array[0]} ${array[1]} 2>&1 | tee output.txt
               node ${{ github.workspace }}/.github/workflows/commentResult.js /home/runner/work/dimension-adapters/dimension-adapters/output.txt "${{ github.repository_owner }}" "${{ github.event.repository.name }}" "${{ github.event.number }}" ${i}
               if grep -q "\-\-\-\- ERROR \-\-\-\-" output.txt; then
                 exit 1;
               fi
-            } || { 
+            } || {
               echo -n $i
               echo ' doesnt run'
             }

.github/workflows/ts-check.yml

@@ -7,13 +7,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
-    - run: yarn run update-submodules
     - name: Get Node.js
       uses: actions/setup-node@v1
       with:
         node-version: '16'
-    - run: yarn
+    - run: npm ci
     - name: Checking adapters
-      run: yarn run ts-check
+      run: npm run ts-check
     - name: Checking cli
-      run: yarn run ts-check-cli
+      run: npm run ts-check-cli

adapters/types.ts

@@ -69,10 +69,10 @@ export type IStartTimestamp = () => Promise<number>
 
 export type BaseAdapter = {
   [chain: string]: {
-    start: IStartTimestamp | number
-    fetch: Fetch|FetchV2;
+    start?: IStartTimestamp | number
+    fetch: Fetch | FetchV2;
     runAtCurrTime?: boolean;
-    customBackfill?: Fetch;
+    customBackfill?: Fetch | FetchV2;
     meta?: {
       methodology?: string | IJSON<string>
       hallmarks?: [number, string][]
@@ -119,6 +119,8 @@ export type FetchResultVolume = FetchResultBase & {
   dailyShortOpenInterest?: FetchResponseValue
   dailyLongOpenInterest?: FetchResponseValue
   dailyOpenInterest?: FetchResponseValue
+  dailyBridgeVolume?: FetchResponseValue
+  totalBridgeVolume?: FetchResponseValue
 };
 
 // FEES
@@ -170,11 +172,21 @@ export enum AdapterType {
   OPTIONS = 'options',
   PROTOCOLS = 'protocols',
   ROYALTIES = 'royalties',
-  AGGREGATOR_DERIVATIVES = 'aggregator-derivatives'
+  AGGREGATOR_DERIVATIVES = 'aggregator-derivatives',
+  BRIDGE_AGGREGATORS = 'bridge-aggregators',
 }
 
 export type FetchResult = FetchResultVolume & FetchResultFees & FetchResultAggregators & FetchResultOptions & FetchResultIncentives
 
+export const whitelistedDimensionKeys = new Set([
+  'startTimestamp', 'chain', 'timestamp','block',
+
+  'dailyVolume', 'totalVolume', 'dailyShortOpenInterest', 'dailyLongOpenInterest', 'dailyOpenInterest', 'dailyBridgeVolume', 'totalBridgeVolume',
+  'totalFees', 'dailyFees', 'dailyUserFees', 'totalRevenue', 'dailyRevenue', 'dailyProtocolRevenue', 'dailyHoldersRevenue', 'dailySupplySideRevenue', 'totalProtocolRevenue', 'totalSupplySideRevenue', 'totalUserFees', 'dailyBribesRevenue', 'dailyTokenTaxes', 'totalHoldersRevenue',
+  'tokenIncentives',
+  'totalPremiumVolume', 'totalNotionalVolume', 'dailyPremiumVolume', 'dailyNotionalVolume',
+])
+
 // End of specific adaptors type
 
 export interface IJSON<T> {

adapters/utils/runAdapter.ts

@@ -1,13 +1,19 @@
-import { Balances, ChainApi, getEventLogs, getProvider } from '@defillama/sdk'
+import { Balances, ChainApi, getEventLogs, getProvider, elastic } from '@defillama/sdk'
 import { BaseAdapter, ChainBlocks, DISABLED_ADAPTER_KEY, Fetch, FetchGetLogsOptions, FetchOptions, FetchResultGeneric, FetchV2, } from '../types'
 import { getBlock } from "../../helpers/getBlock";
 import { getUniqStartOfTodayTimestamp } from '../../helpers/getUniSubgraphFees';
 
 const ONE_DAY_IN_SECONDS = 60 * 60 * 24
 
+function getUnixTimeNow() {
+  return Math.floor(Date.now() / 1000)
+}
+
 export default async function runAdapter(volumeAdapter: BaseAdapter, cleanCurrentDayTimestamp: number, chainBlocks: ChainBlocks, id?: string, version?: string, {
-  adapterVersion = 1
+  adapterVersion = 1,
+  isTest = false,
 }: any = {}) {
+
   const closeToCurrentTime = Math.trunc(Date.now() / 1000) - cleanCurrentDayTimestamp < 24 * 60 * 60 // 12 hours
   const chains = Object.keys(volumeAdapter).filter(c => c !== DISABLED_ADAPTER_KEY)
   const validStart = {} as {
@@ -18,9 +24,23 @@ export default async function runAdapter(volumeAdapter: BaseAdapter, cleanCurren
   }
   await Promise.all(chains.map(setChainValidStart))
 
-  return Promise.all(chains.filter(chain => validStart[chain]?.canRun).map(getChainResult))
+  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
+  }).map(getChainResult))
+  return response
 
   async function getChainResult(chain: string) {
+    const startTime = getUnixTimeNow()
+    const metadata = {
+      application: "dimensions",
+      type: 'protocol-chain',
+      name: id,
+      chain,
+      version,
+    }
+
     const fetchFunction = volumeAdapter[chain].customBackfill ?? volumeAdapter[chain].fetch
     try {
       const options = await getOptionsObject(cleanCurrentDayTimestamp, chain, chainBlocks)
@@ -47,19 +67,31 @@ export default async function runAdapter(volumeAdapter: BaseAdapter, cleanCurren
         result[key] = +Number(result[key]).toFixed(0)
         if (isNaN(result[key] as number)) throw new Error(`[${chain}]Value: ${value} ${key} is NaN`)
       }
+
+      const endTime = getUnixTimeNow()
+      await elastic.addRuntimeLog({ runtime: endTime - startTime, success: true, metadata, })
+
       return {
         chain,
         startTimestamp: validStart[chain].startTimestamp,
         ...result
       }
     } catch (error) {
-      try { (error as any).chain = chain } catch { }
+
+      const endTime = getUnixTimeNow()
+
+      try {
+        await elastic.addErrorLog({ error, metadata, errorString: error?.toString(), } as any)
+        await elastic.addRuntimeLog({ runtime: endTime - startTime, success: false, metadata, });
+
+        (error as any).chain = chain
+      } catch { }
       throw error
     }
   }
 
   async function getOptionsObject(timestamp: number, chain: string, chainBlocks: ChainBlocks): Promise<FetchOptions> {
-    const withinTwoHours = Math.trunc(Date.now() / 1000) - timestamp < 2 * 60 * 60 // 2 hours
+    const withinTwoHours = Math.trunc(Date.now() / 1000) - timestamp < 24 * 60 * 60 // 24 hours
     const createBalances: () => Balances = () => {
       return new Balances({ timestamp: closeToCurrentTime ? undefined : timestamp, chain })
     }
@@ -88,7 +120,7 @@ export default async function runAdapter(volumeAdapter: BaseAdapter, cleanCurren
     const api = new ChainApi({ chain, timestamp: withinTwoHours ? undefined : timestamp, block: toBlock })
     const startOfDay = getUniqStartOfTodayTimestamp(new Date(toTimestamp * 1000))
     const startTimestamp = fromTimestamp
-    const endTimestamp = toTimestamp
+    const endTimestamp = toTimestamp + 1
     const getStartBlock = getFromBlock
     const getEndBlock = getToBlock
     const toApi = api

aggregator-derivatives/bitoro/index.ts

@@ -0,0 +1,55 @@
+import fetchURL from "../../utils/fetchURL";
+import { FetchResult, SimpleAdapter } from "../../adapters/types";
+import { CHAIN } from "../../helpers/chains";
+
+const BitoroX_BASE_URL = "https://min-api.bitoro.network/btr/stats/global";
+const BitoroPro_BASE_URL = "https://min-api.inj.bitoro.network/stats/global";
+const startTimestamp_bitoro_x = 1711324800; // 2024-03-25 00:00:00
+const startTimestamp_bitoro_pro = 1718323200; // 2024-06-14 00:00:00
+
+const getBitoroXUrl = (startTime: number, endTime: number): string => {
+    return `${BitoroX_BASE_URL}?start=${startTime}&end=${endTime}`;
+}
+
+const getBitoroProUrl = (startTime: number, endTime: number): string => {
+    return `${BitoroPro_BASE_URL}?start=${startTime}&end=${endTime}`;
+}
+
+const fetchBitoroX = async (_:any, _b:any ,options: any): Promise<FetchResult> => {
+    const { endTimestamp, startTimestamp } = options;
+    const dailyVolume = await fetchURL(getBitoroXUrl(startTimestamp, endTimestamp));
+    const totalVolume = await fetchURL(getBitoroXUrl(startTimestamp_bitoro_x, endTimestamp));
+
+    return {
+        timestamp: startTimestamp,
+        dailyVolume: dailyVolume.volume || 0,
+        totalVolume: totalVolume.volume || 0,
+    };
+};
+
+const fetchBitoroPro = async (_:any, _b:any ,options: any): Promise<FetchResult> => {
+    const { fromTimestamp, toTimestamp } = options;
+    const dailyVolume = await fetchURL(getBitoroProUrl(fromTimestamp, toTimestamp));
+    const totalVolume = await fetchURL(getBitoroProUrl(startTimestamp_bitoro_pro, toTimestamp));
+
+    return {
+        timestamp: fromTimestamp,
+        dailyVolume: dailyVolume.volume || 0,
+        totalVolume: totalVolume.volume || 0,
+    };
+};
+
+const adapter: SimpleAdapter = {
+    adapter: {
+        [CHAIN.ARBITRUM]: {
+            fetch: fetchBitoroX,
+            start: startTimestamp_bitoro_x
+        },
+        [CHAIN.INJECTIVE]: {
+            fetch: fetchBitoroPro,
+            start: startTimestamp_bitoro_pro
+        }
+    }
+}
+
+export default adapter;