remove DAI injection feature

graphprotocol · Nov 21, 2024 · 63db850 · 63db850
1 parent 6d8975f
commit 63db850
Show file tree

Hide file tree

Showing 31 changed files with 8 additions and 639 deletions.
diff --git a/README.md b/README.md
@@ -206,10 +206,6 @@ Protocol
   --epoch-subgraph-endpoint    Endpoint to query epoch start blocks from
                                                              [string] [required]
 
-Cost Models
-  --inject-dai  Inject the GRT to DAI/USDC conversion rate into cost model
-                variables                              [boolean] [default: true]
-
 Postgres
   --postgres-host      Postgres host                         [string] [required]
   --postgres-port      Postgres port                    [number] [default: 5432]
@@ -238,9 +234,6 @@ Query Fees
 Options:
   --version             Show version number                            [boolean]
   --help                Show help                                      [boolean]
-  --dai-contract        Address of the DAI or USDC contract to use for the
-                        --inject-dai conversion rate
-                [string] [default: "0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48"]
   --offchain-subgraphs  Subgraphs to index that are not on chain
                         (comma-separated)                  [array] [default: []]
 ```

diff --git a/docs/networks/arbitrum-one.md b/docs/networks/arbitrum-one.md
@@ -45,7 +45,6 @@ Other network contracts can be found in [graphprotocol/contracts](https://github
 | `INDEXER_AGENT_MNEMONIC`                    | `--mnemonic`                    | Ethereum mnemonic for mainnet operator                                                                                    |
 | `INDEXER_AGENT_NETWORK_SUBGRAPH_DEPLOYMENT` | `--network-subgraph-deployment` | [![Dynamic JSON Badge](https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fthegraph.com%2Fexplorer%2F_next%2Fdata%2F5PBypsdmUEy39BcWLsyp0%2Fsubgraphs%2FDZz4kDTdmzWLWsV373w2bSmoar3umKKH9y82SUKr5qmp.json%3Fview%3DAbout%26chain%3Darbitrum-one%26id%3DDZz4kDTdmzWLWsV373w2bSmoar3umKKH9y82SUKr5qmp&query=%24.pageProps.subgraph.currentVersion.subgraphDeployment.ipfsHash&label=deployment-id)](https://thegraph.com/explorer/subgraphs/DZz4kDTdmzWLWsV373w2bSmoar3umKKH9y82SUKr5qmp)   |
 | `INDEXER_AGENT_NETWORK_SUBGRAPH_ENDPOINT`   | `--network-subgraph-endpoint`   | `https://gateway-arbitrum.network.thegraph.com/api/[api-key]/subgraphs/id/DZz4kDTdmzWLWsV373w2bSmoar3umKKH9y82SUKr5qmp`   |
-| `INDEXER_AGENT_DAI_CONTRACT`                | `--dai-contract`                | TBD                                                                                                                       |
 | `INDEXER_AGENT_GATEWAY_ENDPOINT`            | `--gateway-endpoint`            | `https://gateway-arbitrum.network.thegraph.com/`                                                                          |
 | `INDEXER_AGENT_GAS_PRICE_MAX`               | `--gas-price-max`               | `50`                                                                                                                      |
 | `INDEXER_AGENT_EPOCH_SUBGRAPH_ENDPOINT`     | `--epoch-subgraph-endpoint`     | `https://gateway-arbitrum.network.thegraph.com/api/[api-key]/subgraphs/id/4KFYqUWRTZQ9gn7GPHC6YQ2q15chJfVrX43ezYcwkgxB`   |

diff --git a/docs/networks/arbitrum-sepolia.md b/docs/networks/arbitrum-sepolia.md
@@ -51,7 +51,6 @@ testnet (for now) are Mainnet subgraphs. This means:
 | `INDEXER_AGENT_MNEMONIC`                    | `--mnemonic`                    | Ethereum mnemonic for testnet operator                                                                                  |
 | `INDEXER_AGENT_NETWORK_SUBGRAPH_DEPLOYMENT` | `--network-subgraph-deployment` | `QmXnGVrg6DvscnvJd86aHAPLGyGrkM17weMrAsFAEMmQLL`                                                                        |
 | `INDEXER_AGENT_NETWORK_SUBGRAPH_ENDPOINT`   | `--network-subgraph-endpoint`   | `https://gateway-arbitrum.network.thegraph.com/api/[api-key]/subgraphs/id/3xQHhMudr1oh69ut36G2mbzpYmYxwqCeU6wwqyCDCnqV` |
-| `INDEXER_AGENT_DAI_CONTRACT`                | `--dai-contract`                | `0x9e7e607afd22906f7da6f1ec8f432d6f244278be` (GDAI)                                                                     |
 | `INDEXER_AGENT_GATEWAY_ENDPOINT`            | `--gateway-endpoint`            | `https://gateway-arbitrum.testnet.thegraph.com/`                                                                        |
 | `INDEXER_AGENT_EPOCH_SUBGRAPH_ENDPOINT`     | `--epoch-subgraph-endpoint`     | `https://gateway-arbitrum.network.thegraph.com/api/[api-key]/subgraphs/id/BhnsdeZihU4SuokxZMLF4FQBVJ3jgtZf6v51gHvz3bSS` |
 | `INDEXER_AGENT_TAP_SUBGRAPH_ENDPOINT`       | `--tap-subgraph-endpoint`       | `https://gateway-arbitrum.network.thegraph.com/api/[api-key]/subgraphs/id/7ubx365MiqBH5iUz6XWXWT8PTof5BVAyEzdb8m17RvbD` |

diff --git a/docs/networks/config-examples/arbitrum-sepolia-indexer-agent-config.yaml b/docs/networks/config-examples/arbitrum-sepolia-indexer-agent-config.yaml
@@ -31,6 +31,3 @@ transactionMonitoring:
   gasIncreaseTimeout: 90
   gasIncreaseFactor: 1.5
   maxTransactionAttempts: 20
-dai:
-  contractAddress: '0x9e7e607afd22906f7da6f1ec8f432d6f244278be'
-  inject: true
diff --git a/docs/networks/config-examples/sepolia-indexer-agent-config.yaml b/docs/networks/config-examples/sepolia-indexer-agent-config.yaml
@@ -29,6 +29,3 @@ transactionMonitoring:
   gasIncreaseTimeout: 90
   gasIncreaseFactor: 1.5
   maxTransactionAttempts: 20
-dai:
-  contractAddress: '0x9e7e607afd22906f7da6f1ec8f432d6f244278be'
-  inject: true
diff --git a/network-configs/config.yaml b/network-configs/config.yaml
@@ -25,6 +25,3 @@ tapAddressBook:
     TAPVerifier: "0xf56b5d582920E4527A818FBDd801C0D80A394CB8"
     AllocationIDTracker: "0xf56b5d582920E4527A818FBDd801C0D80A394CB8"
     Escrow: "0xf56b5d582920E4527A818FBDd801C0D80A394CB8"
-dai:
-  contractAddress: "0x4e8a4C63Df58bf59Fef513aB67a76319a9faf448"
-  inject: false
diff --git a/packages/indexer-agent/README.md b/packages/indexer-agent/README.md
@@ -114,10 +114,6 @@ Query Fees
   --gateway-endpoint,                       Gateway endpoint base URL
   --collect-receipts-endpoint                                [string] [required]
 
-Cost Models
-  --inject-dai  Inject the GRT to DAI/USDC conversion rate into cost model
-                variables                              [boolean] [default: true]
-
 Postgres
   --postgres-host       Postgres host                        [string] [required]
   --postgres-port       Postgres port                   [number] [default: 5432]
@@ -137,9 +133,6 @@ Options:
   --help                Show help                                      [boolean]
   --offchain-subgraphs  Subgraphs to index that are not on chain
                         (comma-separated)                  [array] [default: []]
-  --dai-contract        Address of the DAI or USDC contract to use for the
-                        --inject-dai conversion rate
-                [string] [default: "0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48"]
 
 ```
 

diff --git a/packages/indexer-agent/package.json b/packages/indexer-agent/package.json
@@ -32,7 +32,6 @@
     "@graphprotocol/common-ts": "2.0.11",
     "@graphprotocol/indexer-common": "^0.21.7",
     "@thi.ng/heaps": "^1.3.1",
-    "@uniswap/sdk": "3.0.3",
     "axios": "0.26.1",
     "bs58": "5.0.0",
     "delay": "^5.0.0",

diff --git a/packages/indexer-agent/src/commands/start.ts b/packages/indexer-agent/src/commands/start.ts
@@ -26,7 +26,6 @@ import {
   specification as spec,
 } from '@graphprotocol/indexer-common'
 import { Agent } from '../agent'
-import { startCostModelAutomation } from '../cost'
 import { createSyncingServer } from '../syncing-server'
 import { injectCommonStartupOptions } from './common-options'
 import pMap from 'p-map'
@@ -235,13 +234,6 @@ export const start = {
         default: 100,
         group: 'Query Fees',
       })
-      .option('inject-dai', {
-        description:
-          'Inject the GRT to DAI/USDC conversion rate into cost model variables',
-        type: 'boolean',
-        default: false,
-        group: 'Cost Models',
-      })
       .option('address-book', {
         description: 'Graph contracts address book file path',
         type: 'string',
@@ -257,13 +249,6 @@ export const start = {
         type: 'number',
         default: 3600,
       })
-      .option('dai-contract', {
-        description:
-          'Address of the DAI or USDC contract to use for the --inject-dai conversion rate',
-        type: 'string',
-        // Default to USDC
-        default: '0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
-      })
       .option('register', {
         description: 'Whether to register the indexer on chain',
         type: 'boolean',
@@ -394,11 +379,6 @@ export async function createNetworkSpecification(
     },
   }
 
-  const dai = {
-    contractAddress: argv.daiContractAddress,
-    inject: argv.injectDai,
-  }
-
   const networkProvider = {
     url: argv.networkProvider,
     pollingInterval: argv.ethereumPollingInterval,
@@ -441,12 +421,6 @@ export async function createNetworkSpecification(
     }
   }
 
-  if (chainId !== 1 && dai.inject) {
-    throw new Error(
-      `The DAI injection feature for cost models is only supported on Ethereum Mainnet`,
-    )
-  }
-
   const tapAddressBook = loadFile(argv.tapAddressBook)
 
   try {
@@ -459,7 +433,6 @@ export async function createNetworkSpecification(
       networkProvider,
       addressBook: argv.addressBook,
       tapAddressBook,
-      dai,
     })
   } catch (parsingError) {
     displayZodParsingError(parsingError)
@@ -633,16 +606,6 @@ export async function run(
   })
   logger.info(`Successfully launched indexer management API server`)
 
-  // --------------------------------------------------------------------------------
-  // * Cost Model Automation
-  // --------------------------------------------------------------------------------
-  await startCostModelAutomation({
-    logger,
-    networks,
-    indexerManagement: indexerManagementClient,
-    metrics,
-  })
-
   // --------------------------------------------------------------------------------
   // * Syncing Server
   // --------------------------------------------------------------------------------

diff --git a/packages/indexer-agent/src/cost.ts b/packages/indexer-agent/src/cost.ts
diff --git a/packages/indexer-cli/src/__tests__/indexer/cost.test.ts b/packages/indexer-cli/src/__tests__/indexer/cost.test.ts
@@ -53,23 +53,6 @@ describe('Indexer cost tests singleNetwork', () => {
           timeout: 10000,
         },
       )
-      cliTest(
-        'Indexer cost set variable deployment id - success',
-        [
-          'indexer',
-          'cost',
-          'set',
-          'variables',
-          'QmQ44hgrWWt3Qf2X9XEX2fPyTbmQbChxwNm5c1t4mhKpGt',
-          `'{"DAI": "0.5"}'`,
-        ],
-        'references/indexer-cost-variables-deployment',
-        {
-          expectedExitCode: 0,
-          cwd: baseDir,
-          timeout: 10000,
-        },
-      )
       cliTest(
         'Indexer cost set model deployment id - no arg',
         [
@@ -257,22 +240,5 @@ describe('Indexer cost tests multiNetworks', () => {
         timeout: 10000,
       },
     )
-    cliTest(
-      'Indexer cost set variable deployment id - reject multinetwork mode',
-      [
-        'indexer',
-        'cost',
-        'set',
-        'variables',
-        'QmQ44hgrWWt3Qf2X9XEX2fPyTbmQbChxwNm5c1t4mhKpGt',
-        `'{"DAI": "0.5"}'`,
-      ],
-      'references/indexer-cost-variables-deployment-multinetworks',
-      {
-        expectedExitCode: 1,
-        cwd: baseDir,
-        timeout: 10000,
-      },
-    )
   })
 })
diff --git a/packages/indexer-cli/src/__tests__/util.ts b/packages/indexer-cli/src/__tests__/util.ts
@@ -9,7 +9,6 @@ import stripAnsi from 'strip-ansi'
 import {
   ActionStatus,
   ActionType,
-  CostModelVariables,
   createIndexerManagementClient,
   createIndexerManagementServer,
   defineIndexerManagementModels,
@@ -255,12 +254,6 @@ export const seedCostModels = async () => {
       ).toString(),
       model: 'default => 0.00025;',
     })
-    await models.CostModel.create({
-      deployment: new SubgraphDeploymentID(
-        'QmQ44hgrWWt3Qf2X9XEX2fPyTbmQbChxwNm5c1t4mhKpGt',
-      ).toString(),
-      variables: { DAI: '0.5' } as CostModelVariables,
-    })
   } catch (e) {
     logger.error('Failed to seed CostModel table', { error: e })
     process.exit(1)

diff --git a/packages/indexer-common/src/__tests__/network-specification-files/invalid-address.yml b/packages/indexer-common/src/__tests__/network-specification-files/invalid-address.yml