Skip to content

Commit

Permalink
Merge branch 'DefiLlama:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
@arpitsingh1409
arpitsingh1409 committed Sep 14, 2024
2 parents 5815a7e + e72a220 commit 6e6e8fd
Show file tree
Hide file tree
Showing 29 changed files with 515 additions and 452 deletions.
2 changes: 1 addition & 1 deletion aggregator-derivatives/kwenta/index.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ const PROVIDER_CONFIG = {
},
[CHAIN.ARBITRUM]: {
startTimestamp: 1696032000,
endpoint: "https://subgraph.satsuma-prod.com/7ed49092fef1/equilibria/perennial-v2-arbitrum-new/api",
endpoint: "https://subgraph.perennial.finance/arbitrum",
query: gql`
query aggregateStats($startTimestamp: BigInt!, $endTimestamp: BigInt!) {
marketAccumulations(
Expand Down
10 changes: 7 additions & 3 deletions aggregator-derivatives/vooi/index.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,20 @@ const fetchArbitrum = async (timestamp: number, _t: any, options: FetchOptions):
if (!synfuturesItem) {
synfuturesItem = {dailyVolume: 0, totalVolume: 0}
}
let kiloexItem = fetchData.find(((item) => item.protocol == "kiloex"))
let kiloexItem = fetchData.filter(((item) => item.protocol == "kiloex"))
if (!kiloexItem) {
kiloexItem = {dailyVolume: 0, totalVolume: 0}
}
let dailyVolume = Number(orderlyItem.dailyVolume) + Number(kiloexItem.dailyVolume)
let totalVolume = Number(orderlyItem.totalVolume) + Number(kiloexItem.totalVolume)
let dailyVolume = Number(orderlyItem.dailyVolume)
let totalVolume = Number(orderlyItem.totalVolume)
for (let i in synfuturesItem){
dailyVolume = Number(dailyVolume) + Number(synfuturesItem[i].dailyVolume)
totalVolume = Number(totalVolume) + Number(synfuturesItem[i].totalVolume)
}
for (let i in kiloexItem){
dailyVolume = Number(dailyVolume) + Number(kiloexItem[i].dailyVolume)
totalVolume = Number(totalVolume) + Number(kiloexItem[i].totalVolume)
}
return {
dailyVolume,
totalVolume,
Expand Down
2 changes: 1 addition & 1 deletion aggregators/1inch-agg/index.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ const fetch =
const chainData = data.result.rows.find(
(row: any) => chainsMap[row.blockchain] === chain
);

if (!chainData) throw new Error(`Dune query failed: ${JSON.stringify(data)}`)
return {
dailyVolume: chainData.volume_24h,
timestamp: unixTimestamp,
Expand Down
43 changes: 28 additions & 15 deletions aggregators/udex-agg/index.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,44 +2,57 @@ import { Chain } from "@defillama/sdk/build/general";
import { FetchResult, FetchResultV2, FetchV2, SimpleAdapter } from "../../adapters/types";
import { CHAIN } from "../../helpers/chains";
import customBackfill from "../../helpers/customBackfill";
import fetchURL from "../../utils/fetchURL";
import { getTimestampAtStartOfPreviousDayUTC } from "../../utils/date";

let abi = ["event Swap(address indexed payer,address indexed payee,address fromToken,address toToken,uint fromAmount,uint receivedAmount)"];
let knownTokens=new Set(["0xbb4CdB9CBd36B01bD1cBaEBF2De08d9173bc095c","0x55d398326f99059fF775485246999027B3197955","0x8ac76a51cc950d9822d68b83fe1ad97b32cd580d"])
let knownTokens = new Set(["0xbb4CdB9CBd36B01bD1cBaEBF2De08d9173bc095c", "0x55d398326f99059fF775485246999027B3197955", "0x8ac76a51cc950d9822d68b83fe1ad97b32cd580d"]);
type IContract = {
[c: string | Chain]: string;
}
};

const contract: IContract = {
[CHAIN.BSC]: '0xfCD555b55AA785d46E8c6e9bBB109b10602c431c',
[CHAIN.POLYGON]:'0x464599BDaC77E8e5843D5BbC531EC8aD75d3F7b1',
[CHAIN.ETHEREUM]:'0x9556E8ce70ceA3c43e4A6c17ad2FAb258067b058',
[CHAIN.BASE]:'0x334F493613c1dD33a364684802fB9C728dfcE1A5'

}

const fetch: FetchV2 = async ({ getLogs, createBalances, chain, }): Promise<FetchResultV2> => {
};
const bscStatsApi = "https://public.udex.one/bsc/indexer/56/udex/daliyVolume?";//return max 24 hour volume
const fetch: FetchV2 = async ({ getLogs, createBalances, chain,fromTimestamp, toTimestamp }): Promise<FetchResultV2> => {
const dailyVolume = createBalances();
const logs = (await getLogs({ target: contract[chain], eventAbi: abi[0] }))
logs.map((log: any) => {
if ( knownTokens.has(log.toToken)){
dailyVolume.add(log.toToken, log.receivedAmount)
}else{
dailyVolume.add(log.fromToken, log.fromAmount)
const reqUrl=bscStatsApi+`from_timestamp=${fromTimestamp}&to_timestamp=${toTimestamp}`
if (chain == CHAIN.BSC) {
let data = await fetchURL(reqUrl);
if (data.data) {
return { dailyVolume: data.data};
}
return { dailyVolume: 0 };
} else {
const logs = (await getLogs({ target: contract[chain], eventAbi: abi[0] }));
logs.map((log: any) => {
if (knownTokens.has(log.toToken)) {
dailyVolume.add(log.toToken, log.receivedAmount);
} else {
dailyVolume.add(log.fromToken, log.fromAmount);
}
});
return { dailyVolume };
return { dailyVolume };
}

};


const adapter: SimpleAdapter = {
adapter: Object.keys(contract).reduce((acc, chain) => {
return {
...acc,
[chain]: {
fetch,
start: 1701388800,
runAtCurrTime:false
start: 1724889600,
runAtCurrTime: false
},
}
};
}, {}),
version: 2,
};
Expand Down
38 changes: 38 additions & 0 deletions aggregators/wolfswap/index.ts
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
import { ChainBlocks, FetchOptions } from "../../adapters/types";

const abis = {
"Swapped": "event Swapped(uint indexed id, address wallet, address sourceToken, address destinationToken, uint amountOut)",
}

const contracts = {
polygon: '0x9fB5f7Bc34cEd4dE039405D7bE26CbF1D0a420d9',
cronos: '0xeC68090566397DCC37e54B30Cc264B2d68CF0489',
cronos_zkevm: '0x7c39eAcCd16cDAD8BFE05e1874da1BD315DB766F',
base: '0xE6174feAD698da575312ae85020A3224E556f8F9',
avax: '0x643dEB007DfA43c0D7BeA2155E97E61279d9a56F',
sei: '0x1AD805e80b59C802f9D8059f904DCA6AC153de30',
blast: '0xb86a6e5702C327c5C051Bf5323Cb2bAb5E628d0c',
}

const fetch = async (timestamp: number, _: ChainBlocks, { createBalances, getLogs, chain, api }: FetchOptions) => {
const dailyVolume = createBalances()
const logs = await getLogs({ target: contracts[chain], eventAbi: abis.Swapped, })
logs.forEach((log: any) => {
dailyVolume.add(log.destinationToken, log.amountOut)
})
return { timestamp, dailyVolume }
};

const adapter: any = {
adapter: {
polygon: { fetch, start: 1710972000, },
cronos: { fetch, start: 1711317600, },
cronos_zkevm: { fetch, start: 1718830800, },
base: { fetch, start: 1713128400, },
avax: { fetch, start: 1717189200, },
//sei: { fetch, start: 1717189200, },
blast: { fetch, start: 1709848800, },
},
};

export default adapter;
2 changes: 1 addition & 1 deletion dexs/primex-finance/index.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ const abi = {
OpenPosition:
"event OpenPosition(uint256 indexed positionId, address indexed trader, address indexed openedBy, (uint256 id, uint256 scaledDebtAmount, address bucket, address soldAsset, uint256 depositAmountInSoldAsset, address positionAsset, uint256 positionAmount, address trader, uint256 openBorrowIndex, uint256 createdAt, uint256 updatedConditionsAt, bytes extraParams) position, address feeToken, uint256 protocolFee, uint256 entryPrice, uint256 leverage, (uint256 managerType, bytes params)[] closeConditions)",
OpenPositionV2:
"event OpenPosition( uint256 indexed positionId, address indexed trader, address indexed openedBy, PositionLibrary.Position position, uint256 entryPrice, uint256 leverage, LimitOrderLibrary.Condition[] closeConditions )",
"event OpenPosition( uint256 indexed positionId, address indexed trader, address indexed openedBy, (uint256 id, uint256 scaledDebtAmount, address bucket, address soldAsset, uint256 depositAmountInSoldAsset, address positionAsset, uint256 positionAmount, address trader, uint256 openBorrowIndex, uint256 createdAt, uint256 updatedConditionsAt, bytes extraParams) position, uint256 entryPrice, uint256 leverage, (uint256 managerType, bytes params)[] closeConditions)",
ClosePosition:
"event ClosePosition(uint256 indexed positionId, address indexed trader, address indexed closedBy, address bucketAddress, address soldAsset, address positionAsset, uint256 decreasePositionAmount, int256 profit, uint256 positionDebt, uint256 amountOut, uint8 reason)",
PartialClosePosition:
Expand Down
75 changes: 45 additions & 30 deletions dexs/quickswap/index.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,19 @@ import * as sdk from "@defillama/sdk";
import { BreakdownAdapter } from "../../adapters/types";
import { CHAIN } from "../../helpers/chains";
import { getGraphDimensions } from "../../helpers/getUniSubgraph";
import { DEFAULT_DAILY_VOLUME_FACTORY, DEFAULT_DAILY_VOLUME_FIELD, DEFAULT_TOTAL_VOLUME_FACTORY, DEFAULT_TOTAL_VOLUME_FIELD, getChainVolume } from "../../helpers/getUniSubgraphVolume";
import fetchURL from "../../utils/fetchURL"
import {
DEFAULT_DAILY_VOLUME_FACTORY,
DEFAULT_DAILY_VOLUME_FIELD,
DEFAULT_TOTAL_VOLUME_FACTORY,
DEFAULT_TOTAL_VOLUME_FIELD,
getChainVolume,
} from "../../helpers/getUniSubgraphVolume";
import fetchURL from "../../utils/fetchURL";

const endpoints = {
[CHAIN.POLYGON]: sdk.graph.modifyEndpoint('FUWdkXWpi8JyhAnhKL5pZcVshpxuaUQG8JHMDqNCxjPd'),
[CHAIN.POLYGON]: sdk.graph.modifyEndpoint(
"FUWdkXWpi8JyhAnhKL5pZcVshpxuaUQG8JHMDqNCxjPd",
),
};

const graphs = getChainVolume({
Expand All @@ -18,20 +26,27 @@ const graphs = getChainVolume({
dailyVolume: {
factory: DEFAULT_DAILY_VOLUME_FACTORY,
field: DEFAULT_DAILY_VOLUME_FIELD,
dateField: "date"
dateField: "date",
},
hasDailyVolume: true,
});

const endpointsAlgebraV3 = {
[CHAIN.POLYGON]: sdk.graph.modifyEndpoint('CCFSaj7uS128wazXMdxdnbGA3YQnND9yBdHjPtvH7Bc7'),
[CHAIN.POLYGON]: sdk.graph.modifyEndpoint(
"CCFSaj7uS128wazXMdxdnbGA3YQnND9yBdHjPtvH7Bc7",
),
// [CHAIN.DOGECHAIN]: "https://graph-node.dogechain.dog/subgraphs/name/quickswap/dogechain-info",
[CHAIN.POLYGON_ZKEVM]:"https://api.studio.thegraph.com/query/44554/quickswap-v3-02/0.0.7",
[CHAIN.MANTA]:"https://api.goldsky.com/api/public/project_clo2p14by0j082owzfjn47bag/subgraphs/quickswap/prod/gn"
[CHAIN.POLYGON_ZKEVM]:
"https://api.studio.thegraph.com/query/44554/quickswap-v3-02/0.0.7",
[CHAIN.MANTA]:
"https://api.goldsky.com/api/public/project_clo2p14by0j082owzfjn47bag/subgraphs/quickswap/prod/gn",
};

const endpointsUniV3 = {
[CHAIN.MANTA]:"https://api.goldsky.com/api/public/project_clo2p14by0j082owzfjn47bag/subgraphs/quickswap/prod/gn",
[CHAIN.ASTAR_ZKEVM]:"https://api.studio.thegraph.com/query/44554/astar-quickswap/version/latest"
[CHAIN.MANTA]:
"https://api.goldsky.com/api/public/project_clo2p14by0j082owzfjn47bag/subgraphs/quickswap/prod/gn",
[CHAIN.ASTAR_ZKEVM]:
"https://api.studio.thegraph.com/query/44554/astar-quickswap/version/latest",
};

const graphsAlgebraV3 = getChainVolume({
Expand All @@ -43,7 +58,7 @@ const graphsAlgebraV3 = getChainVolume({
dailyVolume: {
factory: "algebraDayData",
field: "volumeUSD",
dateField: "date"
dateField: "date",
},
});

Expand All @@ -67,55 +82,55 @@ const v3GraphsUni = getGraphDimensions({
},
});


const fetchLiquidityHub = async (timestamp: number) => {
let dailyResult = (await fetchURL('https://hub.orbs.network/analytics-daily/v1'));

let rows = dailyResult.result.rows;
let lastDay = rows[rows.length - 1];
let dailyVolume = lastDay.daily_total_calculated_value;
let totalVolume = (await fetchURL(`https://hub.orbs.network/analytics/v1`)).result.rows[0].total_calculated_value;

return {
dailyVolume: `${dailyVolume}`,
totalVolume: `${totalVolume}`,
timestamp: timestamp,
};
let dailyResult = await fetchURL(
"https://hub.orbs.network/analytics-daily/v1",
);

}
let rows = dailyResult.result.rows;
let lastDay = rows[rows.length - 1];
let dailyVolume = lastDay.daily_total_calculated_value;
let totalVolume = (await fetchURL(`https://hub.orbs.network/analytics/v1`))
.result.rows[0].total_calculated_value;

return {
dailyVolume: `${dailyVolume}`,
totalVolume: `${totalVolume}`,
timestamp: timestamp,
};
};

const adapter: BreakdownAdapter = {
version: 1,
breakdown: {
v2: {
[CHAIN.POLYGON]: {
fetch: graphs(CHAIN.POLYGON),
start: 1602118043
start: 1602118043,
},
},
v3: {
[CHAIN.POLYGON]: {
fetch: graphsAlgebraV3(CHAIN.POLYGON),
start: 1662425243
start: 1662425243,
},
// [CHAIN.DOGECHAIN]: {
// fetch: graphsV3(CHAIN.DOGECHAIN),
// start: 1660694400
// },
[CHAIN.POLYGON_ZKEVM]: {
fetch: graphsAlgebraV3(CHAIN.POLYGON_ZKEVM),
start: 1679875200
start: 1679875200,
},
[CHAIN.MANTA]: {
fetch: v3GraphsUni(CHAIN.MANTA),
start: 1697690974
}
start: 1697690974,
},
},
liquidityHub: {
[CHAIN.POLYGON]: {
fetch: fetchLiquidityHub,
start: 1695042000
start: 1695042000,
},
},
},
Expand Down
Loading

0 comments on commit 6e6e8fd

Please sign in to comment.