feat: subgraph migration (#2083)

aave · May 31, 2024 · e10a0ec · e10a0ec · github-actions · May 31, 2024
1 parent 92f91d4
commit e10a0ec
Show file tree

Hide file tree

Showing 10 changed files with 36 additions and 57 deletions.
diff --git a/.env.development b/.env.development
@@ -8,3 +8,4 @@ NEXT_PUBLIC_WALLET_CONNECT_PROJECT_ID=
 NEXT_PUBLIC_ENABLE_STAKING=true
 NEXT_PUBLIC_ENABLE_GOVERNANCE=true
 NEXT_PUBLIC_API_BASEURL=https://aave-api-v2.aave.com
+NEXT_PUBLIC_SUBGRAPH_API_KEY=
diff --git a/.env.example b/.env.example
@@ -15,3 +15,4 @@ NEXT_PUBLIC_FORK_URL_RPC=
 NEXT_PUBLIC_WALLET_CONNECT_PROJECT_ID=
 NEXT_PUBLIC_MIXPANEL=
 NEXT_PUBLIC_FIAT_ON_RAMP=true
+NEXT_PUBLIC_SUBGRAPH_API_KEY=
diff --git a/.github/actions/build/action.yml b/.github/actions/build/action.yml
@@ -37,6 +37,10 @@ inputs:
     description: wallet connect project id
     required: false
     default: ''
+  NEXT_PUBLIC_SUBGRAPH_API_KEY:
+    description: subgraph api key
+    required: false
+    default: ''
 
 runs:
   using: 'composite'
@@ -79,3 +83,4 @@ runs:
         NEXT_PUBLIC_MIXPANEL: '${{ inputs.NEXT_PUBLIC_MIXPANEL }}'
         NEXT_PUBLIC_FIAT_ON_RAMP: 'false'
         NEXT_PUBLIC_WALLET_CONNECT_PROJECT_ID: '${{ inputs.NEXT_PUBLIC_WALLET_CONNECT_PROJECT_ID }}'
+        NEXT_PUBLIC_SUBGRAPH_API_KEY: '${{ inputs.NEXT_PUBLIC_SUBGRAPH_API_KEY }}'
diff --git a/.github/workflows/build-test-deploy-dev.yml b/.github/workflows/build-test-deploy-dev.yml
@@ -30,6 +30,7 @@ jobs:
           NEXT_PUBLIC_MIXPANEL: ${{ secrets.NEXT_PUBLIC_MIXPANEL }}
           NEXT_PUBLIC_FIAT_ON_RAMP: 'false'
           NEXT_PUBLIC_WALLET_CONNECT_PROJECT_ID: ${{ secrets.WALLET_CONNECT_PROJECT_ID }}
+          NEXT_PUBLIC_SUBGRAPH_API_KEY: ${{ secrets.NEXT_PUBLIC_SUBGRAPH_API_KEY }}
 
       - name: Upload artifacts
         uses: ./.github/actions/upload-artifacts

diff --git a/.github/workflows/build-test-deploy.yml b/.github/workflows/build-test-deploy.yml
@@ -30,6 +30,7 @@ jobs:
           NEXT_PUBLIC_MIXPANEL: ${{ secrets.NEXT_PUBLIC_MIXPANEL }}
           NEXT_PUBLIC_FIAT_ON_RAMP: 'false'
           NEXT_PUBLIC_WALLET_CONNECT_PROJECT_ID: ${{ secrets.WALLET_CONNECT_PROJECT_ID }}
+          NEXT_PUBLIC_SUBGRAPH_API_KEY: ${{ secrets.NEXT_PUBLIC_SUBGRAPH_API_KEY }}
 
       - name: Upload artifacts
         uses: ./.github/actions/upload-artifacts

diff --git a/custom.d.ts b/custom.d.ts
@@ -13,5 +13,6 @@ namespace NodeJS {
     NEXT_PUBLIC_FORK_URL_RPC?: string;
     NEXT_PUBLIC_WALLET_CONNECT_PROJECT_ID: string;
     NEXT_PUBLIC_FIAT_ON_RAMP: string;
+    NEXT_PUBLIC_SUBGRAPH_API_KEY: string;
   }
 }
diff --git a/src/modules/governance/proposal/VotersListModal.tsx b/src/modules/governance/proposal/VotersListModal.tsx
@@ -40,7 +40,7 @@ export const VotersListModal = ({
       <VoteBar
         yae
         percent={proposal.forPercent}
-        votes={proposal.forPercent}
+        votes={proposal.forVotes}
         sx={{
           ...borderBaseStyle,
           px: 4,
@@ -79,7 +79,7 @@ export const VotersListModal = ({
     <>
       <VoteBar
         percent={proposal.againstPercent}
-        votes={proposal.againstPercent}
+        votes={proposal.againstVotes}
         sx={{
           ...borderBaseStyle,
           px: 4,

diff --git a/src/ui-config/governanceConfig.ts b/src/ui-config/governanceConfig.ts
@@ -16,6 +16,7 @@ import {
 
 export const ipfsGateway = 'https://cloudflare-ipfs.com/ipfs';
 export const fallbackIpfsGateway = 'https://ipfs.io/ipfs';
+const subgraphApiKey = process.env.NEXT_PUBLIC_SUBGRAPH_API_KEY;
 
 export interface VotingMachineConfig {
   portalToMachineMap: { [votingPoralAddress: string]: string };
@@ -50,8 +51,7 @@ const sepoliaVotingMachineConfig: VotingMachineConfig = {
   },
   votingPortalDataHelperAddress: '0x133210F3fe2deEB34e65deB6861ee3dF87393977',
   votingMachineAddress: '0xA1995F1d5A8A247c064a76F336E1C2ecD24Ef0D9',
-  subgraphUrl:
-    'https://api.goldsky.com/api/public/project_clk74pd7lueg738tw9sjh79d6/subgraphs/votingmachine-sepolia/v1/gn',
+  subgraphUrl: '',
 };
 
 const fujiVotingMachineConfig: VotingMachineConfig = {
@@ -60,8 +60,7 @@ const fujiVotingMachineConfig: VotingMachineConfig = {
   },
   votingPortalDataHelperAddress: '0x133210F3fe2deEB34e65deB6861ee3dF87393977',
   votingMachineAddress: '0x767AA57554690D23D1E0594E8746271C97e1A1e4',
-  subgraphUrl:
-    'https://api.goldsky.com/api/public/project_clk74pd7lueg738tw9sjh79d6/subgraphs/votingmachine-sepolia-avalanche-testnet/v2/gn',
+  subgraphUrl: '',
 };
 
 type GovernanceChainConfig = {
@@ -72,7 +71,7 @@ export const governanceChainConfig: GovernanceChainConfig = {
   [ChainId.sepolia]: {
     coreChainId: ChainId.sepolia,
     votingChainIds: [ChainId.sepolia, ChainId.fuji],
-    governanceCoreSubgraphUrl: 'https://api.thegraph.com/subgraphs/name/grothem/gov-v3-sepolia',
+    governanceCoreSubgraphUrl: '',
     votingChainConfig: {
       [ChainId.sepolia]: sepoliaVotingMachineConfig,
       [ChainId.fuji]: fujiVotingMachineConfig,
@@ -97,34 +96,31 @@ export const governanceChainConfig: GovernanceChainConfig = {
   [ChainId.mainnet]: {
     coreChainId: ChainId.mainnet,
     votingChainIds: [ChainId.polygon, ChainId.avalanche],
-    governanceCoreSubgraphUrl: 'https://api.thegraph.com/subgraphs/name/aave/governance-v3',
+    governanceCoreSubgraphUrl: `https://gateway-arbitrum.network.thegraph.com/api/${subgraphApiKey}/subgraphs/id/A7QMszgomC9cnnfpAcqZVLr2DffvkGNfimD8iUSMiurK`,
     votingChainConfig: {
       [ChainId.mainnet]: {
         portalToMachineMap: {
           [GovernanceV3Ethereum.VOTING_PORTAL_ETH_ETH]: GovernanceV3Ethereum.VOTING_MACHINE,
         },
         votingPortalDataHelperAddress: GovernanceV3Ethereum.VM_DATA_HELPER,
         votingMachineAddress: GovernanceV3Ethereum.VOTING_MACHINE,
-        subgraphUrl:
-          'https://api.goldsky.com/api/public/project_clk74pd7lueg738tw9sjh79d6/subgraphs/gov-v3-voting-machine-mainnet/1/gn',
+        subgraphUrl: `https://gateway-arbitrum.network.thegraph.com/api/${subgraphApiKey}/subgraphs/id/2QPwuCfFtQ8WSCZoN3i9SmdoabMzbq2pmg4kRbrhymBV`,
       },
       [ChainId.polygon]: {
         portalToMachineMap: {
           [GovernanceV3Ethereum.VOTING_PORTAL_ETH_POL]: GovernanceV3Polygon.VOTING_MACHINE,
         },
         votingPortalDataHelperAddress: GovernanceV3Polygon.VM_DATA_HELPER,
         votingMachineAddress: GovernanceV3Polygon.VOTING_MACHINE,
-        subgraphUrl:
-          'https://api.goldsky.com/api/public/project_clk74pd7lueg738tw9sjh79d6/subgraphs/gov-v3-voting-machine-matic/1/gn',
+        subgraphUrl: `https://gateway-arbitrum.network.thegraph.com/api/${subgraphApiKey}/subgraphs/id/32WLrLTQctAgfoshbkteHfxLu3DpAeZwh2vUPWXV6Qxu`,
       },
       [ChainId.avalanche]: {
         portalToMachineMap: {
           [GovernanceV3Ethereum.VOTING_PORTAL_ETH_AVAX]: GovernanceV3Avalanche.VOTING_MACHINE,
         },
         votingPortalDataHelperAddress: GovernanceV3Avalanche.VM_DATA_HELPER,
         votingMachineAddress: GovernanceV3Avalanche.VOTING_MACHINE,
-        subgraphUrl:
-          'https://api.goldsky.com/api/public/project_clk74pd7lueg738tw9sjh79d6/subgraphs/gov-v3-voting-machine-avalanche/1/gn',
+        subgraphUrl: `https://gateway-arbitrum.network.thegraph.com/api/${subgraphApiKey}/subgraphs/id/FngMWWGJV45McvV7GUBkrta9eoEi3sHZoH7MYnFQfZkr`,
       },
     },
     payloadsControllerDataHelpers: {

diff --git a/src/ui-config/marketsConfig.tsx b/src/ui-config/marketsConfig.tsx
@@ -104,6 +104,8 @@ export enum CustomMarket {
   // permissioned_market = 'permissioned_market',
 }
 
+const apiKey = process.env.NEXT_PUBLIC_SUBGRAPH_API_KEY;
+
 export const marketsData: {
   [key in keyof typeof CustomMarket]: MarketDataType;
 } = {
@@ -122,7 +124,7 @@ export const marketsData: {
       debtSwitch: true,
       switch: true,
     },
-    subgraphUrl: 'https://api.thegraph.com/subgraphs/name/aave/protocol-v3',
+    subgraphUrl: `https://gateway-arbitrum.network.thegraph.com/api/${apiKey}/subgraphs/id/Cd2gEDVeqnjBn1hSeqFMitw8Q1iiyV9FYUZkLNRcL87g`,
     addresses: {
       LENDING_POOL_ADDRESS_PROVIDER: AaveV3Ethereum.POOL_ADDRESSES_PROVIDER,
       LENDING_POOL: AaveV3Ethereum.POOL,
@@ -152,7 +154,7 @@ export const marketsData: {
       debtSwitch: true,
       switch: true,
     },
-    subgraphUrl: 'https://api.thegraph.com/subgraphs/name/aave/protocol-v2',
+    subgraphUrl: `https://gateway-arbitrum.network.thegraph.com/api/${apiKey}/subgraphs/id/8wR23o1zkS4gpLqLNU4kG3JHYVucqGyopL5utGxP2q1N`,
     addresses: {
       LENDING_POOL_ADDRESS_PROVIDER: AaveV2Ethereum.POOL_ADDRESSES_PROVIDER,
       LENDING_POOL: AaveV2Ethereum.POOL,
@@ -193,7 +195,6 @@ export const marketsData: {
     marketTitle: 'Ethereum AMM',
     market: CustomMarket.amm_mainnet,
     chainId: ChainId.mainnet,
-    subgraphUrl: 'https://api.thegraph.com/subgraphs/name/aave/protocol-v2',
     addresses: {
       LENDING_POOL_ADDRESS_PROVIDER: AaveV2EthereumAMM.POOL_ADDRESSES_PROVIDER,
       LENDING_POOL: AaveV2EthereumAMM.POOL,
@@ -215,7 +216,7 @@ export const marketsData: {
       collateralRepay: true,
       debtSwitch: true,
     },
-    subgraphUrl: 'https://api.thegraph.com/subgraphs/name/aave/aave-v2-matic',
+    subgraphUrl: `https://gateway-arbitrum.network.thegraph.com/api/${apiKey}/subgraphs/id/H1Et77RZh3XEf27vkAmJyzgCME2RSFLtDS2f4PPW6CGp`,
     addresses: {
       LENDING_POOL_ADDRESS_PROVIDER: AaveV2Polygon.POOL_ADDRESSES_PROVIDER,
       LENDING_POOL: AaveV2Polygon.POOL,
@@ -241,7 +242,7 @@ export const marketsData: {
       debtSwitch: true,
       switch: true,
     },
-    subgraphUrl: 'https://api.thegraph.com/subgraphs/name/aave/protocol-v2-avalanche',
+    subgraphUrl: `https://gateway-arbitrum.network.thegraph.com/api/${apiKey}/subgraphs/id/EZvK18pMhwiCjxwesRLTg81fP33WnR6BnZe5Cvma3H1C`,
     addresses: {
       LENDING_POOL_ADDRESS_PROVIDER: AaveV2Avalanche.POOL_ADDRESSES_PROVIDER,
       LENDING_POOL: AaveV2Avalanche.POOL,
@@ -290,8 +291,7 @@ export const marketsData: {
       debtSwitch: true,
       switch: true,
     },
-    // TODO: Need subgraph, currently not supported
-    // subgraphUrl: '',
+    subgraphUrl: `https://gateway-arbitrum.network.thegraph.com/api/${apiKey}/subgraphs/id/GQFbb95cE6d8mV989mL5figjaGaKCQB3xqYrr1bRyXqF`,
     addresses: {
       LENDING_POOL_ADDRESS_PROVIDER: AaveV3Base.POOL_ADDRESSES_PROVIDER,
       LENDING_POOL: AaveV3Base.POOL,
@@ -314,7 +314,6 @@ export const marketsData: {
     v3: true,
     permitDisabled: true,
     chainId: ChainId.arbitrum_sepolia,
-    //subgraphUrl: 'https://api.thegraph.com/subgraphs/name/aave/protocol-v3-arbitrum-goerli',  needs re-deployment
     addresses: {
       LENDING_POOL_ADDRESS_PROVIDER: AaveV3ArbitrumSepolia.POOL_ADDRESSES_PROVIDER,
       LENDING_POOL: AaveV3ArbitrumSepolia.POOL,
@@ -326,7 +325,6 @@ export const marketsData: {
       L2_ENCODER: AaveV3ArbitrumSepolia.L2_ENCODER,
     },
   },
-
   [CustomMarket.proto_arbitrum_v3]: {
     marketTitle: 'Arbitrum',
     market: CustomMarket.proto_arbitrum_v3,
@@ -340,7 +338,7 @@ export const marketsData: {
       withdrawAndSwitch: true,
       switch: true,
     },
-    subgraphUrl: 'https://api.thegraph.com/subgraphs/name/aave/protocol-v3-arbitrum',
+    subgraphUrl: `https://gateway-arbitrum.network.thegraph.com/api/${apiKey}/subgraphs/id/DLuE98kEb5pQNXAcKFQGQgfSQ57Xdou4jnVbAEqMfy3B`,
     addresses: {
       LENDING_POOL_ADDRESS_PROVIDER: AaveV3Arbitrum.POOL_ADDRESSES_PROVIDER,
       LENDING_POOL: AaveV3Arbitrum.POOL,
@@ -362,7 +360,6 @@ export const marketsData: {
     v3: true,
     permitDisabled: true,
     chainId: ChainId.base_sepolia,
-    //subgraphUrl: 'https://api.thegraph.com/subgraphs/name/aave/protocol-v3-arbitrum-goerli',  needs re-deployment
     addresses: {
       LENDING_POOL_ADDRESS_PROVIDER: AaveV3BaseSepolia.POOL_ADDRESSES_PROVIDER,
       LENDING_POOL: AaveV3BaseSepolia.POOL,
@@ -387,7 +384,7 @@ export const marketsData: {
       withdrawAndSwitch: true,
       switch: true,
     },
-    subgraphUrl: 'https://api.thegraph.com/subgraphs/name/aave/protocol-v3-avalanche',
+    subgraphUrl: `https://gateway-arbitrum.network.thegraph.com/api/${apiKey}/subgraphs/id/2h9woxy8RTjHu1HJsCEnmzpPHFArU33avmUh4f71JpVn`,
     addresses: {
       LENDING_POOL_ADDRESS_PROVIDER: AaveV3Avalanche.POOL_ADDRESSES_PROVIDER,
       LENDING_POOL: AaveV3Avalanche.POOL,
@@ -411,7 +408,6 @@ export const marketsData: {
       faucet: true,
       incentives: true,
     },
-    //  subgraphUrl: 'https://api.thegraph.com/subgraphs/name/aave/protocol-v3-fuji',  needs re-deployment
     addresses: {
       LENDING_POOL_ADDRESS_PROVIDER: AaveV3Fuji.POOL_ADDRESSES_PROVIDER,
       LENDING_POOL: AaveV3Fuji.POOL,
@@ -428,7 +424,6 @@ export const marketsData: {
     v3: true,
     permitDisabled: true,
     chainId: ChainId.optimism_sepolia,
-    // subgraphUrl: 'https://api.thegraph.com/subgraphs/name/aave/protocol-v3-optimism-goerli',  needs re-deployment
     addresses: {
       LENDING_POOL_ADDRESS_PROVIDER: AaveV3OptimismSepolia.POOL_ADDRESSES_PROVIDER,
       LENDING_POOL: AaveV3OptimismSepolia.POOL,
@@ -470,7 +465,7 @@ export const marketsData: {
       collateralRepay: true,
       liquiditySwap: true,
     },
-    subgraphUrl: 'https://api.thegraph.com/subgraphs/name/aave/protocol-v3-fantom',
+    subgraphUrl: `https://gateway-arbitrum.network.thegraph.com/api/${apiKey}/subgraphs/id/6L1vPqyE3xvkzkWjh6wUKc1ABWYYps5HJahoxhrv2PJn`,
     addresses: {
       LENDING_POOL_ADDRESS_PROVIDER: AaveV3Fantom.POOL_ADDRESSES_PROVIDER,
       LENDING_POOL: AaveV3Fantom.POOL,
@@ -492,7 +487,6 @@ export const marketsData: {
       faucet: true,
       incentives: true,
     },
-    // subgraphUrl: 'https://api.thegraph.com/subgraphs/name/aave/protocol-v3-fantom-testnet',  needs re-deployment
     addresses: {
       LENDING_POOL_ADDRESS_PROVIDER: AaveV3FantomTestnet.POOL_ADDRESSES_PROVIDER,
       LENDING_POOL: AaveV3FantomTestnet.POOL,
@@ -511,7 +505,7 @@ export const marketsData: {
     enabledFeatures: {
       incentives: false,
     },
-    subgraphUrl: 'https://api.thegraph.com/subgraphs/name/aave/protocol-v3-harmony',
+    subgraphUrl: `https://gateway-arbitrum.network.thegraph.com/api/${apiKey}/subgraphs/id/FifJapBdCqT9vgNqJ5axmr6eNyUpUSaRAbbZTfsViNsT`,
     addresses: {
       LENDING_POOL_ADDRESS_PROVIDER: AaveV3Harmony.POOL_ADDRESSES_PROVIDER,
       LENDING_POOL: AaveV3Harmony.POOL,
@@ -535,7 +529,7 @@ export const marketsData: {
       withdrawAndSwitch: true,
       switch: true,
     },
-    subgraphUrl: 'https://api.thegraph.com/subgraphs/name/aave/protocol-v3-optimism',
+    subgraphUrl: `https://gateway-arbitrum.network.thegraph.com/api/${apiKey}/subgraphs/id/DSfLz8oQBUeU5atALgUFQKMTSYV9mZAVYp4noLSXAfvb`,
     addresses: {
       LENDING_POOL_ADDRESS_PROVIDER: AaveV3Optimism.POOL_ADDRESSES_PROVIDER,
       LENDING_POOL: AaveV3Optimism.POOL,
@@ -564,7 +558,7 @@ export const marketsData: {
       withdrawAndSwitch: true,
       switch: true,
     },
-    subgraphUrl: 'https://api.thegraph.com/subgraphs/name/aave/protocol-v3-polygon',
+    subgraphUrl: `https://gateway-arbitrum.network.thegraph.com/api/${apiKey}/subgraphs/id/Co2URyXjnxaw8WqxKyVHdirq9Ahhm5vcTs4dMedAq211`,
     addresses: {
       LENDING_POOL_ADDRESS_PROVIDER: AaveV3Polygon.POOL_ADDRESSES_PROVIDER,
       LENDING_POOL: AaveV3Polygon.POOL,
@@ -587,7 +581,6 @@ export const marketsData: {
       faucet: true,
       incentives: true,
     },
-    subgraphUrl: 'https://api.thegraph.com/subgraphs/name/aave/protocol-v2-fuji',
     addresses: {
       LENDING_POOL_ADDRESS_PROVIDER: AaveV2Fuji.POOL_ADDRESSES_PROVIDER,
       LENDING_POOL: AaveV2Fuji.POOL,
@@ -622,7 +615,7 @@ export const marketsData: {
     market: CustomMarket.proto_gnosis_v3,
     chainId: ChainId.xdai,
     v3: true,
-    subgraphUrl: 'https://api.thegraph.com/subgraphs/name/aave/protocol-v3-gnosis',
+    subgraphUrl: `https://gateway-arbitrum.network.thegraph.com/api/${apiKey}/subgraphs/id/HtcDaL8L8iZ2KQNNS44EBVmLruzxuNAz1RkBYdui1QUT`,
     addresses: {
       LENDING_POOL_ADDRESS_PROVIDER: AaveV3Gnosis.POOL_ADDRESSES_PROVIDER,
       LENDING_POOL: AaveV3Gnosis.POOL,
@@ -638,7 +631,7 @@ export const marketsData: {
     market: CustomMarket.proto_bnb_v3,
     chainId: ChainId.bnb,
     v3: true,
-    subgraphUrl: 'https://api.thegraph.com/subgraphs/name/aave/protocol-v3-bnb',
+    subgraphUrl: `https://gateway-arbitrum.network.thegraph.com/api/${apiKey}/subgraphs/id/7Jk85XgkV1MQ7u56hD8rr65rfASbayJXopugWkUoBMnZ`,
     enabledFeatures: {
       liquiditySwap: true,
       collateralRepay: true,
@@ -665,8 +658,7 @@ export const marketsData: {
     market: CustomMarket.proto_scroll_v3,
     chainId: ChainId.scroll,
     v3: true,
-    subgraphUrl:
-      'https://api.goldsky.com/api/public/project_clk74pd7lueg738tw9sjh79d6/subgraphs/aave-v3-scroll/1.0.0/gn',
+    subgraphUrl: `https://gateway-arbitrum.network.thegraph.com/api/${apiKey}/subgraphs/id/74JwenoHZb2aAYVGCCSdPWzi9mm745dyHyQQVoZ7Sbub`,
     addresses: {
       LENDING_POOL_ADDRESS_PROVIDER: AaveV3Scroll.POOL_ADDRESSES_PROVIDER,
       LENDING_POOL: AaveV3Scroll.POOL,