Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix poolsimulator pool subgraph #714

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open

Fix poolsimulator pool subgraph #714

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2a89aac
chore: fix balancer subgraph
luizakp Aug 27, 2024
3f65f80
remove: apr get pools
luizakp Aug 27, 2024
b8ed78d
fix: pool simulator menu
luizakp Aug 27, 2024
e51402b
chore: fix other subgraphs
luizakp Aug 27, 2024
9dd9d2b
fix format
luizakp Aug 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion apps/balancer-tools/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
"build:prepare": "pnpm npm-run-all -l --parallel 'build:prepare:gql'",
"dev": "pnpm npm-run-all -l --parallel dev:**",
"dev:next": "next dev",
"dev:get-pools": "pnpm --filter=\"@bleu/balancer-apr\" build",
"start": "next start",
"wagmi": "wagmi generate",
"wagmi:watch": "wagmi generate --watch",
Expand Down
2 changes: 1 addition & 1 deletion apps/balancer-tools/src/app/poolsimulator/(components)/Menu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ const POOL_TYPES_MAPPER = {
name: "Meta Stable",
defaultParams: {
swapFee: 0.01,
amp: 5,
ampFactor: 5,
},
},
GyroE: {
Expand Down
2 changes: 1 addition & 1 deletion apps/balancer-tools/src/app/poolsimulator/(components)/PoolParamsForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@ export const PoolParamsForm = forwardRef<unknown, PoolParamsFormProps>(
onSubmit={(data) => onSubmit(createPayload(poolType, data))}
id="initial-data-form"
>
<div className="flex flex-col gap-4">
<div className="flex flex-col gap-4 px-6">
{inputMapper[poolType].map((input) => {
const defaultValue = input.transformFromDataToForm(
data.poolParams?.[input.name],
Expand Down
3 changes: 1 addition & 2 deletions packages/balancer-apr/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,7 @@
"lint:fix": "eslint '**/*.{ts,tsx}' --fix",
"migrations:generate": "drizzle-kit generate:pg",
"migrations:push": "node -r esbuild-register src/db/migrate.ts",
"migrations:drop": "drizzle-kit drop --config=drizzle.config.ts",
"build": "node get-pool-data.js"
"migrations:drop": "drizzle-kit drop --config=drizzle.config.ts"
},
"devDependencies": {
"@bleu/tsconfig": "workspace:*",
Expand Down
121 changes: 67 additions & 54 deletions packages/gql/codegen.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
import { capitalize, Network } from "@bleu/utils";
import { CodegenConfig } from "@graphql-codegen/cli";
import dotenv from "dotenv";

dotenv.config();

export enum Subgraph {
BalancerPoolsMetadata = "balancer-pools-metadata",
Expand All @@ -20,48 +23,54 @@ export enum Subgraph {
// https://linear.app/bleu-llc/issue/BAL-290/deploy-subgraph-with-token-relation-on-other-networks

export const SUBGRAPHS = {
[Subgraph.BalancerPoolsMetadata]: {
name: Subgraph.BalancerPoolsMetadata,
endpoints() {
const baseEndpoint =
"https://api.thegraph.com/subgraphs/name/bleu-studio";
// [Subgraph.BalancerPoolsMetadata]: {
// name: Subgraph.BalancerPoolsMetadata,
// endpoints() {
// const baseEndpoint =
// "https://api.thegraph.com/subgraphs/name/bleu-studio";

return {
[Network.Ethereum]: `${baseEndpoint}/balancer-pool-metadata`,
[Network.Goerli]: `${baseEndpoint}/bal-pools-metadata-goerli`,
[Network.Polygon]: `${baseEndpoint}/balancer-pools-metadata-matic`,
[Network.Arbitrum]: `${baseEndpoint}/bal-pools-metadata-arb`,
[Network.Gnosis]: `${baseEndpoint}/balancer-pools-metadata-gnosis`,
[Network.Optimism]: `${baseEndpoint}/balancer-pools-metadata-op`,
// TODO: deploy Base, Avalanche and sepolia subgraphs
[Network.PolygonZKEVM]: `${baseEndpoint}/balancer-pool-metadata`,
[Network.Base]: `${baseEndpoint}/balancer-pool-metadata`,
[Network.Sepolia]: `${baseEndpoint}/balancer-pool-metadata`,
[Network.Avalanche]: `${baseEndpoint}/balancer-pool-metadata`,
};
},
endpointFor(network: Network) {
return this.endpoints()[network];
},
},
// return {
// [Network.Ethereum]: `${baseEndpoint}/balancer-pool-metadata`,
// [Network.Goerli]: `${baseEndpoint}/bal-pools-metadata-goerli`,
// [Network.Polygon]: `${baseEndpoint}/balancer-pools-metadata-matic`,
// [Network.Arbitrum]: `${baseEndpoint}/bal-pools-metadata-arb`,
// [Network.Gnosis]: `${baseEndpoint}/balancer-pools-metadata-gnosis`,
// [Network.Optimism]: `${baseEndpoint}/balancer-pools-metadata-op`,
// // TODO: deploy Base, Avalanche and sepolia subgraphs
// [Network.PolygonZKEVM]: `${baseEndpoint}/balancer-pool-metadata`,
// [Network.Base]: `${baseEndpoint}/balancer-pool-metadata`,
// [Network.Sepolia]: `${baseEndpoint}/balancer-pool-metadata`,
// [Network.Avalanche]: `${baseEndpoint}/balancer-pool-metadata`,
// };
// },
// endpointFor(network: Network) {
// return this.endpoints()[network];
// },
// },
[Subgraph.BalancerGauges]: {
name: Subgraph.BalancerGauges,
endpoints() {
const baseEndpoint =
"https://api.thegraph.com/subgraphs/name/balancer-labs/balancer-gauges";

return {
[Network.Ethereum]: `${baseEndpoint}`,
// TODO: substitute Sepolia
[Network.Sepolia]: `${baseEndpoint}-goerli`,
[Network.Goerli]: `${baseEndpoint}-goerli`,
[Network.Polygon]: `${baseEndpoint}-polygon`,
[Network.PolygonZKEVM]: `https://api.studio.thegraph.com/query/24660/balancer-gauges-polygon-zk/version/latest`,
[Network.Arbitrum]: `${baseEndpoint}-arbitrum`,
[Network.Gnosis]: `${baseEndpoint}-gnosis-chain`,
[Network.Optimism]: `${baseEndpoint}-optimism`,
[Network.Base]: `https://api.studio.thegraph.com/query/24660/balancer-gauges-base/version/latest`,
[Network.Avalanche]: `${baseEndpoint}-avalanche`,
[Network.Ethereum]:
"https://api.studio.thegraph.com/query/75376/balancer-gauges/version/latest",
[Network.Sepolia]:
"https://api.studio.thegraph.com/query/24660/balancer-gauges-sepolia/version/latest",
[Network.Goerli]:
"https://api.studio.thegraph.com/query/24660/balancer-gauges-sepolia/version/latest",
[Network.Polygon]:
"https://api.studio.thegraph.com/query/75376/balancer-gauges-polygon/version/latest",
[Network.PolygonZKEVM]:
"https://api.studio.thegraph.com/query/24660/balancer-gauges-polygon-zk/version/latest",
[Network.Arbitrum]:
"https://api.studio.thegraph.com/query/75376/balancer-gauges-arbitrum/version/latest",
[Network.Gnosis]:
"https://api.studio.thegraph.com/query/75376/balancer-gauges-gnosis-chain/version/latest",
[Network.Optimism]:
"https://api.studio.thegraph.com/query/75376/balancer-gauges-optimism/version/latest",
[Network.Base]:
"https://api.studio.thegraph.com/query/24660/balancer-gauges-base/version/latest",
[Network.Avalanche]:
"https://api.studio.thegraph.com/query/75376/balancer-gauges-avalanche/version/latest",
};
},
endpointFor(network: Network) {
Expand All @@ -71,21 +80,27 @@ export const SUBGRAPHS = {
[Subgraph.Balancer]: {
name: Subgraph.Balancer,
endpoints() {
const baseEndpoint =
"https://api.thegraph.com/subgraphs/name/balancer-labs";

return {
[Network.Ethereum]: `${baseEndpoint}/balancer-v2`,
[Network.Sepolia]: `https://api.studio.thegraph.com/query/24660/balancer-sepolia-v2/version/latest`,
[Network.Goerli]: `${baseEndpoint}/balancer-goerli-v2`,
[Network.Polygon]: `${baseEndpoint}/balancer-polygon-v2`,
[Network.PolygonZKEVM]: `https://api.studio.thegraph.com/query/24660/balancer-polygon-zk-v2/version/latest`,
[Network.Arbitrum]: `${baseEndpoint}/balancer-arbitrum-v2`,
[Network.Gnosis]: `${baseEndpoint}/balancer-gnosis-chain-v2`,
[Network.Optimism]: `${baseEndpoint}/balancer-optimism-v2`,
[Network.Ethereum]:
"https://api.studio.thegraph.com/query/75376/balancer-v2/version/latest",
[Network.Sepolia]:
"https://api.studio.thegraph.com/query/24660/balancer-sepolia-v2/version/latest",
[Network.Goerli]:
"https://api.studio.thegraph.com/query/24660/balancer-sepolia-v2/version/latest",
[Network.Polygon]:
"https://api.studio.thegraph.com/query/75376/balancer-polygon-v2/version/latest",
[Network.PolygonZKEVM]:
"https://api.studio.thegraph.com/query/24660/balancer-polygon-zk-v2/version/latest",
[Network.Arbitrum]:
"https://api.studio.thegraph.com/query/75376/balancer-arbitrum-v2/version/latest",
[Network.Gnosis]:
"https://api.studio.thegraph.com/query/75376/balancer-gnosis-chain-v2/version/latest",
[Network.Optimism]:
"https://api.studio.thegraph.com/query/75376/balancer-optimism-v2/version/latest",
[Network.Base]:
"https://api.studio.thegraph.com/query/24660/balancer-base-v2/version/latest",
[Network.Avalanche]: `${baseEndpoint}/balancer-avalanche-v2`,
[Network.Avalanche]:
"https://api.studio.thegraph.com/query/75376/balancer-avalanche-v2/version/latest",
};
},
endpointFor(network: Network) {
Expand Down Expand Up @@ -117,8 +132,7 @@ export const SUBGRAPHS = {
[Subgraph.UniswapV2]: {
name: Subgraph.UniswapV2,
endpoints() {
const baseEndpoint =
"https://api.thegraph.com/subgraphs/name/ianlapham/uniswap-v2-dev";
const baseEndpoint = `https://gateway.thegraph.com/api/${process.env.THE_GRAPH_API_KEY}/subgraphs/id/EYCKATKGBKLWvSfwvBjzfCBmGwYNdVkduYXVivCsLRFu`;
return {
[Network.Ethereum]: `${baseEndpoint}`,
};
Expand All @@ -135,10 +149,9 @@ export const SUBGRAPHS = {
[Subgraph.Sushi]: {
name: Subgraph.Sushi,
endpoints() {
const baseEndpoint = "https://api.thegraph.com/subgraphs/name/sushiswap";
return {
[Network.Ethereum]: `${baseEndpoint}/exchange`,
[Network.Gnosis]: `${baseEndpoint}/xdai-exchange`,
[Network.Ethereum]: `https://gateway.thegraph.com/api/${process.env.THE_GRAPH_API_KEY}/subgraphs/id/A4JrrMwrEXsYNAiYw7rWwbHhQZdj6YZg1uVy5wa6g821`,
[Network.Gnosis]: `https://gateway.thegraph.com/api/${process.env.THE_GRAPH_API_KEY}/subgraphs/id/A4JrrMwrEXsYNAiYw7rWwbHhQZdj6YZg1uVy5wa6g821`,
Comment on lines +153 to +154
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is this correct? are we using the same address for mainnet and gnosis?

};
},
endpointFor(network: Network) {
Expand Down
Loading
Loading