.env.example

@@ -0,0 +1,5 @@
+# Arbitrum Sepolia testnet JSON-RPC provider URL for testing (e.g., Infura, Alchemy, etc.)
+INDEXER_TEST_JRPC_PROVIDER_URL=https://arbitrum-sepolia.infura.io/v3/your-project-id
+
+# The Graph API key for querying subgraphs (from The Graph Studio)
+INDEXER_TEST_API_KEY=your-graph-api-key-here

.github/workflows/check-formatting.yml

@@ -3,15 +3,18 @@ name: "Check Formatting"
 on:
   push:
     branches: [main]
-  pull_request:
-    branches: [main]
+  pull_request: {}
 
 jobs:
   check:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - name: Checkout
         uses: actions/checkout@v2
+      - name: Set up Node.js v20
+        uses: actions/setup-node@v2.1.5
+        with:
+          node-version: 20
       - name: Build and Format
         run: yarn
       - name: Check Formatting

.github/workflows/ci.yml

@@ -6,20 +6,15 @@ name: CI
 on:
   push:
     branches: [main]
-  pull_request:
-    branches: [main]
+  pull_request: {}
 
 jobs:
   build:
     strategy:
       matrix:
-        node-version: [14, 16, 17]
+        node-version: [18, 20, 22]
         system:
-          - os: ubuntu-20.04
-        include:
-          - node_version: 18
-            system:
-              os: ubuntu-22.04
+          - os: ubuntu-22.04
     runs-on: ${{ matrix.system.os }}
     services:
       postgres:
@@ -38,6 +33,10 @@ jobs:
           --health-retries 5
     steps:
       - uses: actions/checkout@v2
+      - name: update OS
+        run: |
+          sudo apt-get update
+          sudo apt install -y --no-install-recommends gcc g++ make build-essential
       - name: Use Node.js ${{ matrix.node-version }}
         uses: actions/setup-node@v1
         with:
@@ -52,4 +51,6 @@ jobs:
           POSTGRES_TEST_DATABASE: indexer_tests
           POSTGRES_TEST_USERNAME: testuser
           POSTGRES_TEST_PASSWORD: testpass
-          NODE_OPTIONS: '--dns-result-order=ipv4first'
+          NODE_OPTIONS: "--dns-result-order=ipv4first"
+          INDEXER_TEST_JRPC_PROVIDER_URL: ${{ secrets.TESTS_RPC_PROVIDER }}
+          INDEXER_TEST_API_KEY: ${{ secrets.TESTS_API_KEY }}

.github/workflows/codeql-analysis.yml

@@ -23,7 +23,7 @@ on:
 jobs:
   analyze:
     name: Analyze
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
 
     strategy:
       fail-fast: false

.github/workflows/indexer-agent-image.yml

@@ -11,7 +11,7 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     permissions:
       packages: write
 
@@ -34,6 +34,14 @@ jobs:
           registry: ghcr.io
           username: ${{github.repository_owner}}
           password: ${{secrets.GITHUB_TOKEN}}
+      - name: Setup python
+        uses: actions/setup-python@v4
+        with:
+          python-version: '3.11'
+      - name: Set up Node.js v20
+        uses: actions/setup-node@v2.1.5
+        with:
+          node-version: 20
       - name: Build and push Indexer Agent image
         id: docker_build
         uses: docker/build-push-action@v2

.github/workflows/indexer-cli-image.yml

@@ -11,7 +11,7 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     permissions:
       packages: write
 
@@ -34,6 +34,14 @@ jobs:
           registry: ghcr.io
           username: ${{github.repository_owner}}
           password: ${{secrets.GITHUB_TOKEN}}
+      - name: Setup python
+        uses: actions/setup-python@v4
+        with:
+          python-version: '3.11'
+      - name: Set up Node.js v20
+        uses: actions/setup-node@v2.1.5
+        with:
+          node-version: 20
       - name: Build and push Indexer CLI image
         id: docker_build
         uses: docker/build-push-action@v2

.gitignore

@@ -119,3 +119,4 @@ yalc.lock
 # IDE
 .idea/
 .envrc
+.vscode

Dockerfile.indexer-agent

@@ -1,15 +1,11 @@
 ########################################################################
 # Build image
 
-FROM node:16.15-bullseye-slim as build
+FROM node:20.11-bookworm-slim as build
 
 ENV NODE_ENV production
 
-RUN apt-get update && apt-get install -y python build-essential git curl
-
-# Install Rust
-RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs > /tmp/rustup.sh && sh /tmp/rustup.sh -y
-ENV PATH="/root/.cargo/bin:$PATH"
+RUN apt-get update && apt-get install -y python3 build-essential git curl
 
 WORKDIR /opt/indexer
 
@@ -29,20 +25,17 @@ RUN yarn --frozen-lockfile --non-interactive --production=false
 ########################################################################
 # Runtime image
 
-FROM node:16.15-bullseye-slim
+FROM node:20.11-bookworm-slim
 
 ENV NODE_ENV production
 # When simulating large transactions, sometimes indexer-agent runs out of memory.
 # This flag seems force node into GC earlier, preventing the crash
 # 1536mb is 1.5GB, which is appropriate for an environment with 2GB RAM
-ENV NODE_OPTIONS="--max-old-space-size=1536"
-
+# todo: increase this temporarily to 4GB to see if it fixes the crash
+ENV NODE_OPTIONS="--max-old-space-size=4096"
 
-RUN apt-get update && apt-get install -y python build-essential git curl
 
-# Install Rust
-RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs > /tmp/rustup.sh && sh /tmp/rustup.sh -y
-ENV PATH="/root/.cargo/bin:$PATH"
+RUN apt-get update && apt-get install -y python3 build-essential git curl
 
 WORKDIR /opt/indexer
 
@@ -52,6 +45,7 @@ COPY yarn.lock .
 COPY tsconfig.json .
 COPY lerna.json .
 
+
 # Copy build output
 COPY --from=build /opt/indexer/packages/indexer-common/package.json /opt/indexer/packages/indexer-common/package.json
 COPY --from=build /opt/indexer/packages/indexer-common/dist /opt/indexer/packages/indexer-common/dist

Dockerfile.indexer-cli

@@ -1,15 +1,11 @@
 ########################################################################
 # Build image
 
-FROM node:16.15-bullseye-slim as build
+FROM node:20.11-bookworm-slim as build
 
 ENV NODE_ENV production
 
-RUN apt-get update && apt-get install -y python build-essential git curl
-
-# Install Rust
-RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs > /tmp/rustup.sh && sh /tmp/rustup.sh -y
-ENV PATH="/root/.cargo/bin:$PATH"
+RUN apt-get update && apt-get install -y python3 build-essential git curl
 
 WORKDIR /opt/indexer
 
@@ -21,7 +17,6 @@ COPY lerna.json .
 
 # Copy shared and package files
 COPY packages/indexer-common/ ./packages/indexer-common
-COPY packages/indexer-native/ ./packages/indexer-native
 COPY packages/indexer-cli/ ./packages/indexer-cli
 
 # Install dependencies; include dev dependencies
@@ -30,11 +25,11 @@ RUN yarn --frozen-lockfile --non-interactive --production=false
 ########################################################################
 # Runtime image
 
-FROM node:16.15-bullseye-slim
+FROM node:20.11-bookworm-slim
 
 ENV NODE_ENV production
 
-RUN apt-get update && apt-get install -y python build-essential git curl
+RUN apt-get update && apt-get install -y python3 build-essential git curl
 
 # Install Rust
 RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs > /tmp/rustup.sh && sh /tmp/rustup.sh -y
@@ -56,7 +51,6 @@ COPY --from=build /opt/indexer/packages/indexer-cli/dist /opt/indexer/packages/i
 COPY --from=build /opt/indexer/packages/indexer-cli/bin /opt/indexer/packages/indexer-cli/bin
 
 
-
 # Install dependencies; exclude dev dependencies
 RUN yarn --frozen-lockfile --non-interactive --production=true
 RUN ln -s /opt/indexer/packages/indexer-cli/bin/graph-indexer /usr/bin/graph

README.md

@@ -1,7 +1,6 @@
 # Graph Protocol Indexer Components
 
 ![CI](https://github.com/graphprotocol/indexer/workflows/CI/badge.svg)
-[![Docker Image: Indexer Service](https://github.com/graphprotocol/indexer/workflows/Indexer%20Service%20Image/badge.svg)](https://github.com/orgs/graphprotocol/packages/container/package/indexer-service)
 [![Docker Image: Indexer Agent](https://github.com/graphprotocol/indexer/workflows/Indexer%20Agent%20Image/badge.svg)](https://github.com/orgs/graphprotocol/packages/container/package/indexer-agent)
 
 **NOTE: THIS PROJECT IS BETA SOFTWARE.**
@@ -19,7 +18,6 @@ query fees, can be found [here](./docs/scalar.md).
 The indexer service, agent and CLI can be installed as NPM packages, using
 
 ```sh
-npm install -g @graphprotocol/indexer-service
 npm install -g @graphprotocol/indexer-agent
 
 # Indexer CLI is a plugin for Graph CLI, so both need to be installed:
@@ -30,9 +28,6 @@ npm install -g @graphprotocol/indexer-cli
 After that, they can be run with the following commands:
 
 ```sh
-# Indexer service
-graph-indexer-service start ...
-
 # Indexer agent
 graph-indexer-agent start ...
 
@@ -42,68 +37,6 @@ graph indexer ...
 
 ## Usage
 
-### Indexer service
-
-```sh
-$ graph-indexer-service start --help
-
-Start the service
-
-Ethereum
-  --ethereum                   Ethereum node or provider URL [string] [required]
-  --ethereum-network           Ethereum network    [string] [default: "mainnet"]
-  --ethereum-polling-interval  Polling interval for the Ethereum provider (ms)
-                                                        [number] [default: 4000]
-  --mnemonic                   Mnemonic for the operator wallet
-                                                             [string] [required]
-  --indexer-address            Ethereum address of the indexer
-                                                             [string] [required]
-
-Indexer Infrastructure
-  --port                        Port to serve queries at[number] [default: 7600]
-  --metrics-port                Port to serve Prometheus metrics at
-                                                        [number] [default: 7300]
-  --graph-node-query-endpoint   Graph Node endpoint to forward queries to
-                                                             [string] [required]
-  --graph-node-status-endpoint  Graph Node endpoint for indexing statuses etc.
-                                                             [string] [required]
-  --log-level                   Log level            [string] [default: "debug"]
-
-Postgres
-  --postgres-host      Postgres host                         [string] [required]
-  --postgres-port      Postgres port                    [number] [default: 5432]
-  --postgres-username  Postgres username          [string] [default: "postgres"]
-  --postgres-password  Postgres password                  [string] [default: ""]
-  --postgres-database  Postgres database name                [string] [required]
-
-Network Subgraph
-  --network-subgraph-endpoint    Endpoint to query the network subgraph from
-                                                             [string] [required]
-  --network-subgraph-auth-token  Bearer token to require for /network queries
-                                                                        [string]
-  --serve-network-subgraph       Whether to serve the network subgraph at
-                                 /network             [boolean] [default: false]
-  --allocation-syncing-interval  Interval (in ms) for syncing indexer
-                                 allocations from the network
-                                                      [number] [default: 120000]
-
-Query Fees
-  --vector-node                 URL of a vector node                    [string]
-  --vector-router               Public identifier of the vector router  [string]
-  --vector-transfer-definition  Address of the Graph transfer definition
-                                contract              [string] [default: "auto"]
-
-Options:
-  --version                Show version number                         [boolean]
-  --help                   Show help                                   [boolean]
-  --gcloud-profiling       Whether to enable Google Cloud profiling
-                                                      [boolean] [default: false]
-  --free-query-auth-token  Auth token that clients can use to query for free
-                                                                         [array]
-  --client-signer-address  Address that signs query fee receipts from a known
-                           client                                       [string]
-```
-
 ### Indexer agent
 
 ```sh
@@ -162,23 +95,23 @@ Indexer Infrastructure
   --rebate-claim-threshold              Minimum value of rebate for a single
                                         allocation (in GRT) in order for it to
                                         be included in a batch rebate claim
-                                        on-chain       [string] [default: "200"]
+                                        on-chain       [string] [default: "1"]
   --rebate-claim-batch-threshold        Minimum total value of all rebates in an
                                         batch (in GRT) before the batch is
                                         claimed on-chain
-                                                      [string] [default: "2000"]
+                                                      [string] [default: "5"]
   --rebate-claim-max-batch-size         Maximum number of rebates inside a
                                         batch. Upper bound is constrained by
                                         available system memory, and by the
                                         block gas limit  [number] [default: 100]
   --voucher-redemption-threshold        Minimum value of rebate for a single
                                         allocation (in GRT) in order for it to
                                         be included in a batch rebate claim
-                                        on-chain       [string] [default: "200"]
+                                        on-chain       [string] [default: "1"]
   --voucher-redemption-batch-threshold  Minimum total value of all rebates in an
                                         batch (in GRT) before the batch is
                                         claimed on-chain
-                                                      [string] [default: "2000"]
+                                                      [string] [default: "5"]
   --voucher-redemption-max-batch-size   Maximum number of rebates inside a
                                         batch. Upper bound is constrained by
                                         available system memory, and by the
@@ -206,10 +139,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 +167,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: []]
 ```
@@ -294,56 +220,36 @@ build the packages:
 yarn
 ```
 
-After this, the indexer service and agent can be run with:
+After this, the agent can be run with:
 
 ```sh
-# Indexer service
-cd packages/indexer-service
-./bin/graph-indexer-service start ...
-
 # Indexer agent
 cd packages/indexer-agent
 ./bin/graph-indexer-agent start ...
 ```
 
 ## Docker images
 
-The easiest way to run the indexer service agent is by using Docker. Docker
+The easiest way to run the indexer agent is by using Docker. Docker
 images can either be pulled via
 
 ```sh
-docker pull ghcr.io/graphprotocol/indexer-service:latest
 docker pull ghcr.io/graphprotocol/indexer-agent:latest
 ```
 
 or built locally with
 
 ```sh
-# Indexer service
-docker build \
-  -f Dockerfile.indexer-service \
-  -t indexer-service:latest \
-  .
-
 # Indexer agent
 docker build \
   -f Dockerfile.indexer-agent \
   -t indexer-agent:latest \
   .
 ```
 
-After this, the indexer agent and service can be run as follows:
-
-1. Indexer service:
-
-   ```sh
-   docker run -p 7600:7600 -it indexer-service:latest ...
-   ```
-
-   After this, the indexer service should be up and running at
-   http://localhost:7600/.
+After this, the indexer agent can be run as follows:
 
-2. Indexer Agent
+1. Indexer Agent
 
    ```sh
    docker run -p 18000:8000 -it indexer-agent:latest ...
@@ -371,7 +277,6 @@ workspaces](https://classic.yarnpkg.com/en/docs/workspaces/).
 [chan](https://github.com/geut/chan/tree/master/packages/chan) is
 used to maintain the following changelogs:
 
-- [indexer-service](packages/indexer-service/CHANGELOG.md)
 - [indexer-agent](packages/indexer-agent/CHANGELOG.md)
 - [indexer-cli](packages/indexer-cli/CHANGELOG.md)
 - [indexer-common](packages/indexer-common/CHANGELOG.md)
@@ -381,16 +286,12 @@ Creating a new release involves the following steps:
 1. Update all changelogs:
 
    ```sh
-   pushd packages/indexer-service
+   pushd packages/indexer-agent
    chan added ...
    chan fixed ...
    chan changed ...
    popd
 
-   pushd packages/indexer-agent
-   ...
-   popd
-
    pushd packages/indexer-cli
    ...
    popd
@@ -408,6 +309,41 @@ Creating a new release involves the following steps:
    yarn release <version>
    ```
 
+## Running tests locally
+
+To run the tests locally, you'll need:
+1. Docker installed and running
+2. Node.js and Yarn
+3. An Arbitrum Sepolia testnet RPC provider (e.g., Infura, Alchemy)
+4. An API key from The Graph Studio for querying subgraphs
+
+### Setup
+
+1. Create a `.env` file in the root directory with your credentials. You can copy the example file as a template:
+```sh
+cp .env.example .env
+```
+
+Then edit `.env` with your credentials:
+```plaintext
+# Your Arbitrum Sepolia testnet RPC endpoint
+INDEXER_TEST_JRPC_PROVIDER_URL=https://sepolia.infura.io/v3/your-project-id
+
+# Your API key from The Graph Studio (https://thegraph.com/studio/)
+INDEXER_TEST_API_KEY=your-graph-api-key-here
+```
+
+2. Run the tests:
+```sh
+bash scripts/run-tests.sh
+```
+
+The script will:
+- Start a PostgreSQL container with the required test configuration
+- Load your credentials from the `.env` file
+- Run the test suite
+- Clean up the PostgreSQL container when done
+
 # Copyright
 
 Copyright &copy; 2020-2021 The Graph Foundation

docs/action-queue.md

@@ -41,7 +41,7 @@ Local usage from source
 # Queue allocate action (allocateFrom())
 ./bin/graph-indexer indexer actions queue allocate QmeqJ6hsdyk9dVbo1tvRgAxWrVS3rkERiEMsxzPShKLco6 5000
 
-# Queue reallocate action (closeAndAllocate())
+# Queue reallocate action (close and allocate using multicall())
 ./bin/graph-indexer indexer actions queue reallocate QmeqJ6hsdyk9dVbo1tvRgAxWrVS3rkERiEMsxzPShKLco6 0x4a58d33e27d3acbaecc92c15101fbc82f47c2ae5 55000
 
 # Queue unallocate action (closeAllocation())
@@ -130,8 +130,8 @@ input ActionInput {
     poi: String
     force: Boolean
     source: String!
-    reason: String
-    priority: Int
+    reason: String!
+    priority: Int!
 }
 
 input ActionUpdateInput {

docs/errors.md

@@ -512,7 +512,7 @@ issues with your Ethereum node or provider, but it may also simply be an
 internal error in ethers.js, in which case you can ignore this error.
 
 If the error is _not_ related to Ethereum requests, it is likely to be an
-unhandled error in indexer-agent and indexer-service and is best reported as an
+unhandled error in indexer-agent and is best reported as an
 issue on https://github.com/graphprotocol/indexer/issues.
 
 ## IE036
@@ -523,7 +523,7 @@ An operation failed somewhere in the system but this error wasn't handled.
 
 **Solution**
 
-This is likely to be an unhandled error in indexer-agent and indexer-service and
+This is likely to be an unhandled error in indexer-agent and
 is best reported as an issue on https://github.com/graphprotocol/indexer/issues.
 
 ## IE037
@@ -788,7 +788,7 @@ Allocation amounts must be non-negative numbers. To resolve this issue ensure th
 
 **Summary**
 
-Action was not executed succesfully: contracts paused or operator not authorized.
+Action was not executed successfully: contracts paused or operator not authorized.
 
 **Solution**
 
@@ -842,7 +842,7 @@ Failed to resolve POI: POI not available for deployment at current epoch start b
 
 **Solution**
 
-This error typically indicates a subgraph deployment that is too far behind the chain head to resolve a valid POI for closing the allocation. To succesfully resolve the POI and close the allocation you'll need to wait for the index node to sync the deployment enough to generate a POI for the current epoch start block. If you do not want to wait to sync you may choose to forfeit indexing rewards for the allocation by force closing it with a 0 POI by creating an unallocate or reallocate action item: `graph indexer actions queue unallocate/reallocate <deployment-id> <allocation-id> 0 true`.
+This error typically indicates a subgraph deployment that is too far behind the chain head to resolve a valid POI for closing the allocation. To successfully resolve the POI and close the allocation you'll need to wait for the index node to sync the deployment enough to generate a POI for the current epoch start block. If you do not want to wait to sync you may choose to forfeit indexing rewards for the allocation by force closing it with a 0 POI by creating an unallocate or reallocate action item: `graph indexer actions queue unallocate/reallocate <deployment-id> <allocation-id> 0 true`.
 
 ## IE068
 
@@ -886,4 +886,4 @@ This is a sub-error of `IE069`. It is reported when the indexer agent doesn't ha
 
 **Solution**
 
-Please provide a `epoch-subgraph-endpoint` and make sure graph node has consistent network configurations (`mainnet`, `goerli`, `gnosis`) and is on or after version 0.28.0.
+Please provide a `epoch-subgraph-endpoint` and make sure graph node has consistent network configurations (`mainnet`, `sepolia`, `gnosis`) and is on or after version 0.28.0.

docs/feature-support-matrix.md

@@ -1,30 +1,62 @@
 # Feature support matrix
 
-As described in [GIP-0008](https://snapshot.org/#/council.graphprotocol.eth/proposal/0xbdd884654a393620a7e8665b4289201b7542c3ee62becfad133e951b0c408444), this defines indexing & querying features which are experimental or not fully supported for indexing & query rewards and arbitration.
-
-Each deployment of The Graph Network has its own specific Feature support matrix, as features will be introduced to testnet & mainnet at different stages of the development and testing lifecycle.
-
-An example:
-
-| Subgraph Feature         | Aliases | Implemented | Experimental | Query Arbitration | Indexing Arbitration | Indexing Rewards |
-|--------------------------|---------|-------------|--------------|-------------------|----------------------|------------------|
-| **Core Features**        |         |             |              |                   |                      |                  |
-| Full-text Search         |         | Yes         | No           | No                | Yes                  | Yes              |
-| Non-Fatal Errors         |         | Yes         | Yes          | Yes               | Yes                  | Yes              |
-| Grafting                 |         | Yes         | Yes          | Yes               | Yes                  | Yes              |
-| **Data Source Types**    |         |             |              |                   |                      |                  |
-| eip155:*                 | *       | Yes         | No           | No                | No                   | No               |
-| eip155:1                 | mainnet | Yes         | No           | Yes               | Yes                  | Yes              |
-| eip155:100               | gnosis  | Yes         | No           | Yes               | Yes                  | Yes              |
-| near:*                   | *       | Yes         | Yes          | No                | No                   | No               |
-| cosmos:*                 | *       | Yes         | Yes          | No                | No                   | No               |
-| arweave:*                | *       | Yes         | Yes          | No                | No                   | No               |
-| **Data Source Features** |         |             |              |                   |                      |                  |
-| ipfs.cat in mappings     |         | Yes         | Yes          | No                | No                   | No               |
-| ENS                      |         | Yes         | Yes          | No                | No                   | No               |
+As described in [GIP-0008](https://snapshot.org/#/council.graphprotocol.eth/proposal/0xbdd884654a393620a7e8665b4289201b7542c3ee62becfad133e951b0c408444), the Feature support matrix defines indexing & querying features which are experimental or not fully supported for indexing & query rewards and arbitration.
 
+The matrix below reflects the canonical Council-ratified version. As outlined in GIP-00008, Council ratification is currently required for each update, which may happen at different stages of feature development and testing lifecycle.
 
+| Subgraph Feature           | Aliases       | Implemented | Experimental | Query Arbitration | Indexing Arbitration | Indexing Rewards |
+| -------------------------- | ------------- | ----------- | ------------ | ----------------- | -------------------- | ---------------- |
+| **Core Features**          |               |             |              |                   |                      |                  |
+| Full-text Search           |               | Yes         | No           | No                | Yes                  | Yes              |
+| Non-Fatal Errors           |               | Yes         | Yes          | Yes               | Yes                  | Yes              |
+| Grafting                   |               | Yes         | Yes          | Yes               | Yes                  | Yes              |
+| **Data Source Types**      |               |             |              |                   |                      |                  |
+| eip155:\*                  | \*            | Yes         | No           | No                | No                   | No               |
+| eip155:1                   | mainnet       | Yes         | No           | Yes               | Yes                  | Yes              |
+| eip155:100                 | gnosis        | Yes         | Yes          | Yes               | Yes                  | Yes              |
+| near:\*                    | \*            | Yes         | Yes          | No                | No                   | No               |
+| arweave:\*                 | \*            | Yes         | Yes          | No                | No                   | No               |
+| eip155:42161               | artbitrum-one | Yes         | Yes          | Yes               | Yes                  | Yes              |
+| eip155:42220               | celo          | Yes         | Yes          | Yes               | Yes                  | Yes              |
+| eip155:43114               | avalanche     | Yes         | Yes          | Yes               | Yes                  | Yes              |
+| eip155:250                 | fantom        | Yes         | Yes          | Yes               | Yes                  | Yes              |
+| eip155:137                 | polygon       | Yes         | Yes          | Yes               | Yes                  | Yes              |
+| eip155:10                  | optimism      | Yes         | Yes          | Yes               | Yes                  | Yes              |
+| eip155:8453                | base          | Yes         | Yes          | Yes               | Yes                  | Yes              |
+| eip155:534352              | scroll        | Yes         | Yes          | Yes               | Yes                  | Yes              |
+| eip155:59144               | linea         | Yes         | Yes          | Yes               | Yes                  | Yes              |
+| eip155:56                  | bsc           | Yes         | Yes          | Yes               | Yes                  | Yes              |
+| eip155:122                 | fuse          | Yes         | Yes          | Yes               | Yes                  | Yes              |
+| eip155:81457               | blast-mainnet | Yes         | Yes          | Yes               | Yes                  | Yes              |
+| eip155:288                 | boba          | Yes         | Yes          | Yes               | Yes                  | Yes              |
+| eip155:56288               | boba-bnb      | Yes         | Yes          | Yes               | Yes                  | Yes              |
+| eip155:7777777             | zora          | Yes         | Yes          | Yes               | Yes                  | Yes              |
+| eip155:34443               | mode          | Yes         | Yes          | Yes               | Yes                  | Yes              |
+| eip155:1284                | moonbeam      | Yes         | Yes          | Yes               | Yes                  | Yes              |
+| eip155:30                  | rootstock     | Yes         | Yes          | Yes               | Yes                  | Yes              |
+| **Data Source Features**   |               |             |              |                   |                      |                  |
+| ipfs.cat in mappings       |               | Yes         | Yes          | No                | No                   | No               |
+| ENS                        |               | Yes         | Yes          | Yes               | Yes                  | Yes              |
+| File data sources: Arweave |               | Yes         | Yes          | No                | Yes                  | Yes              |
+| File data sources: IPFS    |               | Yes         | Yes          | No                | Yes                  | Yes              |
+| Substreams: mainnet        |               | Yes         | Yes          | Yes               | Yes                  | Yes              |
+| Substreams: optimism       |               | Yes         | Yes          | Yes               | Yes                  | Yes              |
+
+The accepted `graph-node` version range must always be specified; it always comprises the latest available version and the one immediately preceding it.
+The latest for the feature matrix above:
+
+```
+graph-node: >=0.35.0 <=0.36.1
+```
+
+### Latest Council snapshot
+
+[GGP-0050 Updated Feature Matrix Support (zora, mode, moonbeam)](https://snapshot.org/#/s:council.graphprotocol.eth/proposal/0x7c1b0eaa299a24ba23f76d86d85b903ac8e8457db3656531e7bd5cee80c20146)
+
+### Other notes
+
+- Currently, one single matrix is used to reflect protocol behaviour for both Ethereum mainnet and Arbitrum One.
 - Aliases can be used in subgraph manifest files to refer to specific networks.
 - Experimental features are generally not fully supported for indexing rewards and arbitration, and usage of experimental features will be considered during any arbitration that does occur.
 - Query fees apply to all queries, regardless of the underlying features used by a subgraph.
-- Subgraph features not named in the matrix are assumed to be fully supported for indexing & query rewards and arbitration
+- Subgraph features not named in the matrix are assumed to be fully supported for indexing & query rewards and arbitration

docs/networks.md

@@ -1,9 +1,9 @@
 # Mainnet and Testnet Configuration
-
-> This content has been moved
 
-[Mainnet configuration](./networks/mainnet.md)
+[Arbitrum One configuration](./networks/arbitrum-one.md)
+
+[Arbitrum Sepolia configuration](./networks/arbitrum-sepolia.md)
 
-[Testnet configuration](./networks/testnet.md)
+[Testnet setup instructions](./testnet-setup.md)
 
-[Testnet setup instructions](./testnet-setup.md)
+[Feature Support Matrix (Ethereum & Arbitrum One)](./feature-support-matrix.md)

docs/networks/arbitrum-one.md

@@ -0,0 +1,92 @@
+# Arbitrum One Configuration
+
+Network information can be found at https://thegraph.com/explorer?chain=arbitrum-one. The Graph Network mainnet is open for everyone to participate in as an indexer. The only requirement is a minimum stake of 100k GRT.
+
+## Latest Releases
+
+| Component          | Release                                                                            |
+| ------------------ | ---------------------------------------------------------------------------------- |
+| contracts          | [![GitHub Release](https://img.shields.io/github/v/release/graphprotocol/contracts)](https://github.com/graphprotocol/contracts/releases)          |
+| indexer-agent      | [![GitHub Release](https://img.shields.io/github/v/release/graphprotocol/indexer)](https://github.com/graphprotocol/indexer/releases)           |
+| indexer-cli        | [![GitHub Release](https://img.shields.io/github/v/release/graphprotocol/indexer)](https://github.com/graphprotocol/indexer/releases)            |
+| indexer-service-rs | [![GitHub Release](https://img.shields.io/github/v/release/graphprotocol/indexer-rs?filter=indexer-service-rs-*)](https://github.com/graphprotocol/indexer-rs/releases?q=indexer-service-rs) |
+| indexer-tap-agent  | [![GitHub Release](https://img.shields.io/github/v/release/graphprotocol/indexer-rs?filter=indexer-tap-agent-*)](https://github.com/graphprotocol/indexer-rs/releases?q=indexer-tap-agent) |
+| graph-node         | [![GitHub Release](https://img.shields.io/github/v/release/graphprotocol/graph-node)](https://github.com/graphprotocol/graph-node/releases)         |
+
+## Network Parameters
+
+| Parameter                   | Value                 |
+| --------------------------- | --------------------  |
+| Epoch length                | ~ 24h (6646 blocks)   |
+| Maximum allocation lifetime | ~28 days (28 epochs)  |
+
+## Contracts & accounts
+
+| Name               | Address                                                                                                                |
+| ------------------ | ---------------------------------------------------------------------------------------------------------------------- |
+| Graph Token (GRT)  | [`0x9623063377AD1B27544C965cCd7342f7EA7e88C7`](https://arbiscan.io/address/0x9623063377AD1B27544C965cCd7342f7EA7e88C7) |
+| Staking            | [`0x00669A4CF01450B64E8A2A20E9b1FCB71E61eF03`](https://arbiscan.io/address/0x00669A4CF01450B64E8A2A20E9b1FCB71E61eF03) |
+| Data Edge          | [`0x633bb9790d7c4c59991cebd377c0ed6501a35ebe`](https://arbiscan.io/address/0x633bb9790d7c4c59991cebd377c0ed6501a35ebe) |
+| Block Oracle Owner | [`0x5f49491e965895ded343af13389ee45ef60ed793`](https://arbiscan.io/address/0x5f49491e965895ded343af13389ee45ef60ed793) |
+| TAP Escrow         | [`0x8f477709eF277d4A880801D01A140a9CF88bA0d3`](https://arbiscan.io/address/0x8f477709eF277d4A880801D01A140a9CF88bA0d3) |
+
+Other network contracts can be found in [graphprotocol/contracts](https://github.com/graphprotocol/contracts/blob/dev/addresses.json#L752) and 
+[semiotic-ai/timeline-aggregation-protocol-contracts](https://github.com/semiotic-ai/timeline-aggregation-protocol-contracts/blob/main/addresses.json).
+
+## Configuration
+
+### Indexer Agent
+
+| Environment Variable                        | CLI Argument                    | Value                                                                                                                     |
+|---------------------------------------------|---------------------------------| ------------------------------------------------------------------------------------------------------------------------- |
+| `INDEXER_AGENT_ETHEREUM`                    | `--ethereum`                    | An Arbitrum mainnet node/provider                                                                                         |
+| `INDEXER_AGENT_INDEXER_ADDRESS`             | `--indexer-address`             | Ethereum address of mainnet indexer                                                                                       |
+| `INDEXER_AGENT_INDEXER_GEO_COORDINATES`     | `--indexer-geo-coordinates`     | Geo coordinates of mainnet indexer infrastructure                                                                         |
+| `INDEXER_AGENT_MNEMONIC`                    | `--mnemonic`                    | Ethereum mnemonic for mainnet operator                                                                                    |
+| `INDEXER_AGENT_GATEWAY_ENDPOINT`            | `--gateway-endpoint`            | `https://gateway-arbitrum.network.thegraph.com/`                                                                          |
+| `INDEXER_AGENT_GAS_PRICE_MAX`               | `--gas-price-max`               | `50`                                                                                                                      |
+| `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_EPOCH_SUBGRAPH_DEPLOYMENT`   | `--epoch-subgraph-deployment`   | [![Dynamic JSON Badge](https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fthegraph.com%2Fexplorer%2F_next%2Fdata%2F5PBypsdmUEy39BcWLsyp0%2Fsubgraphs%2F4KFYqUWRTZQ9gn7GPHC6YQ2q15chJfVrX43ezYcwkgxB.json%3Fview%3DAbout%26chain%3Darbitrum-one%26id%3D4KFYqUWRTZQ9gn7GPHC6YQ2q15chJfVrX43ezYcwkgxB&query=%24.pageProps.subgraph.currentVersion.subgraphDeployment.ipfsHash&label=deployment-id)](https://thegraph.com/explorer/subgraphs/4KFYqUWRTZQ9gn7GPHC6YQ2q15chJfVrX43ezYcwkgxB)   |
+| `INDEXER_AGENT_EPOCH_SUBGRAPH_ENDPOINT`     | `--epoch-subgraph-endpoint`     | `https://gateway-arbitrum.network.thegraph.com/api/[api-key]/subgraphs/id/4KFYqUWRTZQ9gn7GPHC6YQ2q15chJfVrX43ezYcwkgxB`   |
+| `INDEXER_AGENT_TAP_SUBGRAPH_DEPLOYMENT`     | `--tap-subgraph-deployment`     | [![Dynamic JSON Badge](https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fthegraph.com%2Fexplorer%2F_next%2Fdata%2F5PBypsdmUEy39BcWLsyp0%2Fsubgraphs%2F4sukbNVTzGELnhdnpyPqsf1QqtzNHEYKKmJkgaT8z6M1.json%3Fview%3DAbout%26chain%3Darbitrum-one%26id%3D4sukbNVTzGELnhdnpyPqsf1QqtzNHEYKKmJkgaT8z6M1&query=%24.pageProps.subgraph.currentVersion.subgraphDeployment.ipfsHash&label=deployment-id)](https://thegraph.com/explorer/subgraphs/4sukbNVTzGELnhdnpyPqsf1QqtzNHEYKKmJkgaT8z6M1)   |
+| `INDEXER_AGENT_TAP_SUBGRAPH_ENDPOINT`       | `--tap-subgraph-endpoint`       | `https://gateway-arbitrum.network.thegraph.com/api/[api-key]/subgraphs/id/4sukbNVTzGELnhdnpyPqsf1QqtzNHEYKKmJkgaT8z6M1` |
+
+
+In order to avoid collecting or claiming query fees below a certain threshold
+(e.g. below the cost of the two transactions), the following configuration
+option can be used.
+
+| Environment Variable                         | CLI Argument                      | Value                                                                                     |
+| -------------------------------------------- | --------------------------------- | ----------------------------------------------------------------------------------------- |
+| `INDEXER_AGENT_REBATE_CLAIM_THRESHOLD`       | `--rebate-claim-threshold`        | Minimum rebate (in GRT) received for an allocation to claim (Default: 1)                |
+| `INDEXER_AGENT_REBATE_CLAIM_BATCH_THRESHOLD` | `--rebate-claim-batch-threshold`  | Minimum total rebates (in GRT) before a batched claim is processed (Default: 5)        |
+| `INDEXER_AGENT_VOUCHER_EXPIRATION`           | `--voucher-expiration`            | Time (in seconds) to permanently delete vouchers with too few query fees  (Default: 2160) |
+
+### Indexer Service rs *and* TAP Agent
+
+They are configured using a TOML file provided with `--config`. You should start with [the minimal config example](https://github.com/graphprotocol/indexer-rs/blob/main/config/minimal-config-example.toml). You can find the full config [here](https://github.com/graphprotocol/indexer-rs/blob/main/config/maximal-config-example.toml) and the default values 
+[here](https://github.com/graphprotocol/indexer-rs/blob/main/config/default_values.toml).
+
+| Variable                               | Value                                                                                                                   |
+| -------------------------------------- | ----------------------------------------------------------------------------------------------------------------------- |
+| `indexer.indexer_address`              | Ethereum address of testnet indexer                                                                                     |
+| `indexer.operator_mnemonic`            | Ethereum mnemonic for testnet operator                                                                                  |
+| `subgraphs.network.deployment_id`      | `QmUzRg2HHMpbgf6Q4VHKNDbtBEJnyp5JWCh2gUX9AV6jXv`                                                                        |
+| `subgraphs.network.query_url`          | `https://gateway-arbitrum.network.thegraph.com/api/[api-key]/subgraphs/id/DZz4kDTdmzWLWsV373w2bSmoar3umKKH9y82SUKr5qmp` |
+| `subgraphs.escrow.deployment_id`       | `QmUhiH6Z5xo6o3GNzsSvqpGKLmCt6w5WzKQ1yHk6C8AA8S`                                                                        |
+| `subgraphs.escrow.query_url`           | `https://gateway-arbitrum.network.thegraph.com/api/[api-key]/subgraphs/id/4sukbNVTzGELnhdnpyPqsf1QqtzNHEYKKmJkgaT8z6M1` |
+| `blockchain.receipts_verifier_address` | `0x33f9E93266ce0E108fc85DdE2f71dab555A0F05a`                                                                            |
+| `tap.sender_aggregator_endpoints`      | `0xDDE4cfFd3D9052A9cb618fC05a1Cd02be1f2F467 = https://tap-aggregator.network.thegraph.com`                              |
+
+Notes:
+- You can supply those nested values using environment variables as such: `indexer.indexer_address` -> `INDEXER_SERVICE_INDEXER__INDEXER_ADDRESS` (mind the double `_`)
+- `tap.sender_aggregator_endpoints` takes a key-value list of sender address + TAP aggregator pairs. Your indexer will accept business only from the senders you add in
+  that list. The value provided in the table above only lists the E&N gateway for now.
+
+### Graph Node
+
+| Environment Variable | CLI Argument     | Value                               |
+| -------------------- | ---------------- | ----------------------------------- |
+| `ethereum`           | `--ethereum-rpc` | `mainnet:<ethereum-json-rpc-url>`   |
+| `ipfs`               | `--ipfs`         | `https://ipfs.network.thegraph.com` |

docs/networks/arbitrum-sepolia.md

@@ -0,0 +1,123 @@
+# Testnet Configuration
+
+The Graph Network's testnet is on Arbitrum Sepolia (eip155:421614). Sepolia network information can be found at https://testnet.thegraph.com/explorer?chain=arbitrum-sepolia.
+
+## Latest Releases
+
+| Component          | Release                                                                              |
+| ------------------ | ------------------------------------------------------------------------------------ |
+| contracts          | [5.3.3](https://github.com/graphprotocol/contracts/releases/tag/v5.3.3)              |
+| indexer-agent      | [0.22.0](https://github.com/graphprotocol/indexer/releases/tag/v0.22.0)              |
+| indexer-cli        | [0.22.0](https://github.com/graphprotocol/indexer/releases/tag/v0.22.0)              |
+| indexer-service-rs | [1.0.0](https://github.com/graphprotocol/indexer-rs/releases/tag/v1.0.0)             |
+| tap-agent          | [1.0.0](https://github.com/graphprotocol/indexer-rs/releases/tag/v1.0.0)             |
+| graph-node         | [0.35.1](https://github.com/graphprotocol/graph-node/releases/tag/v0.35.1)           |
+
+## Network Parameters
+
+| Parameter                   | Value             |
+| --------------------------- | ----------------- |
+| Epoch length                | ~ 2h (554 blocks) |
+| Maximum allocation lifetime | ~ 9h (4 epochs)   |
+
+## Contracts & accounts
+
+| Name               | Address                                                                                                                        |
+| ------------------ | ------------------------------------------------------------------------------------------------------------------------------ |
+| Graph Token (GRT)  | [`0xf8c05dCF59E8B28BFD5eed176C562bEbcfc7Ac04`](https://sepolia.arbiscan.io/address/0xf8c05dCF59E8B28BFD5eed176C562bEbcfc7Ac04) |
+| Staking            | [`0x865365C425f3A593Ffe698D9c4E6707D14d51e08`](https://sepolia.arbiscan.io/address/0x865365C425f3A593Ffe698D9c4E6707D14d51e08) |
+| Data Edge          | [`0x9b9402939133F27c6eba81a321dfBFa1feE6714E`](https://sepolia.arbiscan.io/address/0x9b9402939133F27c6eba81a321dfBFa1feE6714E) |
+| Block Oracle Owner | [`0x76BC183A6d9AC1e4C5ccb27b7D46DDf0d2cc9868`](https://sepolia.arbiscan.io/address/0x76BC183A6d9AC1e4C5ccb27b7D46DDf0d2cc9868) |
+| TAP Escrow         | [`0x1e4dC4f9F95E102635D8F7ED71c5CdbFa20e2d02`](https://sepolia.arbiscan.io/address/0x1e4dC4f9F95E102635D8F7ED71c5CdbFa20e2d02) |
+
+Other network contracts can be found in [graphprotocol/contracts](https://github.com/graphprotocol/contracts/blob/main/packages/contracts/addresses.json) and 
+[semiotic-ai/timeline-aggregation-protocol-contracts](https://github.com/semiotic-ai/timeline-aggregation-protocol-contracts/blob/main/addresses.json).
+
+## Configuration
+
+The Graph testnet contracts live on Arbitrum Sepolia, but many of the subgraphs used in the
+testnet (for now) are Mainnet subgraphs. This means:
+
+- Indexer Agent and Indexer Service must connect to Arbitrum Sepolia
+- Graph Node must connect to at least one Mainnet Ethereum node/provider
+
+### Indexer Agent
+
+| Environment Variable                        | CLI Argument                    | Value                                                                                                                   |
+|---------------------------------------------|---------------------------------| ----------------------------------------------------------------------------------------------------------------------- |
+| `INDEXER_AGENT_ETHEREUM`                    | `--ethereum`                    | An Arbitrum Sepolia node/provider                                                                                       |
+| `INDEXER_AGENT_INDEXER_ADDRESS`             | `--indexer-address`             | Ethereum address of testnet indexer                                                                                     |
+| `INDEXER_AGENT_INDEXER_GEO_COORDINATES`     | `--indexer-geo-coordinates`     | Geo coordinates of testnet indexer infrastructure                                                                       |
+| `INDEXER_AGENT_MNEMONIC`                    | `--mnemonic`                    | Ethereum mnemonic for testnet operator                                                                                  |
+| `INDEXER_AGENT_GATEWAY_ENDPOINT`            | `--gateway-endpoint`            | `https://gateway-arbitrum.testnet.thegraph.com/`                                                                        |
+| `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_EPOCH_SUBGRAPH_DEPLOYMENT`   | `--epoch-subgraph-deployment`   | `QmNNn48AU8CZei8sYLXrXABMHkiXAuQDvFaZHYYPryKEvF`                                                                        |
+| `INDEXER_AGENT_EPOCH_SUBGRAPH_ENDPOINT`     | `--epoch-subgraph-endpoint`     | `https://gateway-arbitrum.network.thegraph.com/api/[api-key]/subgraphs/id/BhnsdeZihU4SuokxZMLF4FQBVJ3jgtZf6v51gHvz3bSS` |
+| `INDEXER_AGENT_TAP_SUBGRAPH_DEPLOYMENT`     | `--tap-subgraph-deployment`     | `QmUiLdbsk6c51UMdcNBxsP3KadJpkmp6a3k2NCprR4ZFeM`                                                                        |
+| `INDEXER_AGENT_TAP_SUBGRAPH_ENDPOINT`       | `--tap-subgraph-endpoint`       | `https://gateway-arbitrum.network.thegraph.com/api/[api-key]/subgraphs/id/7ubx365MiqBH5iUz6XWXWT8PTof5BVAyEzdb8m17RvbD` |
+
+In order to avoid collecting or claiming query fees below a certain threshold
+(e.g. below the cost of the two transactions), the following configuration
+option can be used.
+
+| Environment Variable                         | CLI Argument                     | Value                                                                                    |
+| -------------------------------------------- | -------------------------------- | ---------------------------------------------------------------------------------------- |
+| `INDEXER_AGENT_REBATE_CLAIM_THRESHOLD`       | `--rebate-claim-threshold`       | Minimum rebate (in GRT) received for an allocation to claim (Default: 1)                 |
+| `INDEXER_AGENT_REBATE_CLAIM_BATCH_THRESHOLD` | `--rebate-claim-batch-threshold` | Minimum total rebates (in GRT) before a batched claim is processed (Default: 5)          |
+| `INDEXER_AGENT_VOUCHER_EXPIRATION`           | `--voucher-expiration`           | Time (in seconds) to permanently delete vouchers with too few query fees (Default: 2160) |
+
+### Indexer Service rs *and* TAP Agent
+
+They are configured using a TOML file provided with `--config`. You should start with [the minimal config example](https://github.com/graphprotocol/indexer-rs/blob/main/config/minimal-config-example.toml). You can find the full config [here](https://github.com/graphprotocol/indexer-rs/blob/main/config/maximal-config-example.toml) and the default values 
+[here](https://github.com/graphprotocol/indexer-rs/blob/main/config/default_values.toml).
+
+| Variable                               | Value                                                                                                                   |
+| -------------------------------------- | ----------------------------------------------------------------------------------------------------------------------- |
+| `indexer.indexer_address`              | Ethereum address of testnet indexer                                                                                     |
+| `indexer.operator_mnemonic`            | Ethereum mnemonic for testnet operator                                                                                  |
+| `subgraphs.network.deployment_id`      | `QmXnGVrg6DvscnvJd86aHAPLGyGrkM17weMrAsFAEMmQLL`                                                                        |
+| `subgraphs.network.query_url`          | `https://gateway-arbitrum.network.thegraph.com/api/[api-key]/subgraphs/id/3xQHhMudr1oh69ut36G2mbzpYmYxwqCeU6wwqyCDCnqV` |
+| `subgraphs.escrow.deployment_id`       | `QmUiLdbsk6c51UMdcNBxsP3KadJpkmp6a3k2NCprR4ZFeM`                                                                        |
+| `subgraphs.escrow.query_url`           | `https://gateway-arbitrum.network.thegraph.com/api/[api-key]/subgraphs/id/7ubx365MiqBH5iUz6XWXWT8PTof5BVAyEzdb8m17RvbD` |
+| `blockchain.receipts_verifier_address` | `0xfC24cE7a4428A6B89B52645243662A02BA734ECF`                                                                            |
+| `tap.sender_aggregator_endpoints`      | `0xC3dDf37906724732FfD748057FEBe23379b0710D = https://tap-aggregator.testnet.thegraph.com`                              |
+
+Notes:
+- You can supply those nested values using environment variables as such: `indexer.indexer_address` -> `INDEXER_SERVICE_INDEXER__INDEXER_ADDRESS` (mind the double `_`)
+- `tap.sender_aggregator_endpoints` takes a key-value list of sender address + TAP aggregator pairs. Your indexer will accept business only from the senders you add in
+  that list. The value provided in the table above only lists the E&N gateway for now.
+
+### Graph Node
+
+| Environment Variable | CLI Argument     | Value                               |
+| -------------------- | ---------------- | ----------------------------------- |
+| `ethereum`           | `--ethereum-rpc` | `arbitrum-sepolia:...`              |
+| `ipfs`               | `--ipfs`         | `https://ipfs.network.thegraph.com` |
+
+## Feature support
+
+> This defines indexing & querying features which are experimental or not fully supported for indexing & query rewards and arbitration ([read more](../feature-support-matrix.md)).
+
+| Subgraph Feature         | Aliases          | Implemented | Experimental | Query Arbitration | Indexing Arbitration | Indexing Rewards |
+| ------------------------ | ---------------- | ----------- | ------------ | ----------------- | -------------------- | ---------------- |
+| **Core Features**        |                  |             |              |                   |                      |                  |
+| Full-text Search         |                  | Yes         | No           | No                | Yes                  | Yes              |
+| Non-Fatal Errors         |                  | Yes         | Yes          | Yes               | Yes                  | Yes              |
+| Grafting                 |                  | Yes         | Yes          | Yes               | Yes                  | Yes              |
+| **Data Source Types**    |                  |             |              |                   |                      |                  |
+| eip155:\*                | \*               | Yes         | No           | No                | No                   | No               |
+| eip155:1                 | mainnet          | Yes         | No           | Yes               | Yes                  | Yes              |
+| eip155:100               | gnosis           | Yes         | No           | Yes               | Yes                  | Yes              |
+| near:\*                  | \*               | Yes         | Yes          | No                | No                   | No               |
+| cosmos:\*                | \*               | Yes         | Yes          | No                | No                   | No               |
+| arweave:\*               | \*               | Yes         | Yes          | No                | No                   | No               |
+| eip155:42161             | arbitrum-one     | Yes         | Yes          | Yes               | Yes                  | Yes              |
+| eip155:42220             | celo             | Yes         | Yes          | Yes               | Yes                  | Yes              |
+| eip155:43114             | avalanche        | Yes         | Yes          | Yes               | Yes                  | Yes              |
+| **Data Source Features** |                  |             |              |                   |                      |                  |
+| ipfs.cat in mappings     |                  | Yes         | Yes          | No                | No                   | No               |
+| ENS                      |                  | Yes         | Yes          | No                | No                   | No               |
+| File data sources: IPFS  |                  | Yes         | Yes          | No                | Yes                  | Yes              |
+| eip155:421614            | sepolia          | Yes         | Yes          | No                | Yes                  | Yes              |
+| eip155:421614            | arbitrum-sepolia | Yes         | Yes          | No                | Yes                  | Yes              |

docs/networks/config-examples/arbitrum-sepolia-indexer-agent-config.yaml

@@ -0,0 +1,33 @@
+networkIdentifier: 'arbitrum-sepolia'
+indexerOptions:
+  address: '?'
+  mnemonic: '?'
+  url: '?'
+  geoCoordinates: [118.2923, 36.5785]
+  defaultAllocationAmount: 1000
+  allocationManagementMode: 'oversight'
+  restakeRewards: true
+  poiDisputeMonitoring: true
+  poiDisputableEpochs: 3
+  voucherRedemptionThreshold: 100
+  voucherRedemptionBatchThreshold: 250
+  rebateClaimThreshold: 100
+  rebateClaimBatchThreshold: 250
+gateway:
+  url: 'https://gateway-testnet-arbitrum.network.thegraph.com'
+subgraphs:
+  maxBlockDistance: 60
+  freshnessSleepMilliseconds: 10000
+  networkSubgraph:
+    url: 'https://gateway-arbitrum.network.thegraph.com/api/[api-key]/subgraphs/id/3xQHhMudr1oh69ut36G2mbzpYmYxwqCeU6wwqyCDCnqV'
+    deployment: 'QmT8UDGK7zKd2u2NQZwhLYHdA4KM55QsivkE3ouCuX6fEj'
+  epochSubgraph:
+    url: 'https://gateway-arbitrum.network.thegraph.com/api/[api-key]/subgraphs/id/BhnsdeZihU4SuokxZMLF4FQBVJ3jgtZf6v51gHvz3bSS'
+    deployment: 'QmTpu2mVquoMpr4SWSM77nGkU3tcUS1Bhk1sVHpjDrAUAx'
+networkProvider:
+  url: '?'
+transactionMonitoring:
+  baseFeePerGasMax: 100
+  gasIncreaseTimeout: 90
+  gasIncreaseFactor: 1.5
+  maxTransactionAttempts: 20

docs/networks/config-examples/sepolia-indexer-agent-config.yaml

@@ -0,0 +1,31 @@
+networkIdentifier: 'sepolia'
+indexerOptions:
+  address: '?'
+  mnemonic: '?'
+  url: '?'
+  geoCoordinates: [118.2923, 36.5785]
+  defaultAllocationAmount: 5000
+  allocationManagementMode: 'oversight'
+  restakeRewards: true
+  poiDisputeMonitoring: true
+  poiDisputableEpochs: 3
+  voucherRedemptionThreshold: 100
+  voucherRedemptionBatchThreshold: 250
+  rebateClaimThreshold: 100
+  rebateClaimBatchThreshold: 250
+gateway:
+  url: 'https://gateway.testnet.thegraph.com'
+subgraphs:
+  networkSubgraph:
+    url: 'https://gateway-arbitrum.network.thegraph.com/api/[api-key]/subgraphs/id/8pVKDwHniAz87CHEQsiz2wgFXGZXrbMDkrxgauVVfMJC'
+    deployment: 'QmdwyUJ2GNAkSxLc3dRgFULf5fN1mZWYeQLjXsdowQcfTg'
+  epochSubgraph:
+    url: 'https://gateway-arbitrum.network.thegraph.com/api/[api-key]/subgraphs/id/3nEnuQEQd1aP6wksKvRUnuwLQcQy1zD3HPFaHZ8cMVqM'
+    deployment: 'QmUXAKvt84bYpkctHgXqWBjq1YY7DaTCKfmxEh8w9Xxb5X'
+networkProvider:
+  url: '?'
+transactionMonitoring:
+  baseFeePerGasMax: 100
+  gasIncreaseTimeout: 90
+  gasIncreaseFactor: 1.5
+  maxTransactionAttempts: 20

docs/subgraph-freshness.md

@@ -0,0 +1,49 @@
+# Subgraph Freshness Checker Feature
+
+## Overview
+
+The `SubgraphFreshnessChecker` class is introduced to enhance the reliability and timeliness of subgraph queries in environments where the subgraph might lag significantly behind the most recent block on the blockchain. It primarily operates by validating subgraph freshness and issuing warnings if the subgraph is not sufficiently synchronized with the latest blockchain state.
+
+## Key Concepts
+
+- **Subgraph Freshness:** A metric to determine how synchronized a subgraph is with the main blockchain. It's gauged by comparing the latest indexed block in the subgraph with the most recent block on the network.
+
+## Feature Details
+
+### 1. Continuous Retry Mechanism
+The `SubgraphFreshnessChecker` perpetually retries subgraph queries under circumstances where the subgraph is notably behind the most recent block on the blockchain. A warning, including the current block distance from the chain head, is issued if this condition is detected.
+
+### 2. Configuration
+Configuration options have been expanded to allow control over the subgraph freshness checking mechanism via network specification files and Command Line Interface (CLI) parameters:
+
+- **maxBlockDistance:** An integer defining the acceptable distance (in blocks) between the latest indexed block in the subgraph and the most recent block on the network. If the distance exceeds this value, the subgraph is considered "stale," prompting a retry mechanism and possibly a warning.
+
+- **freshnessSleepMilliseconds:** An integer dictating the waiting duration (in milliseconds) before a query is retried when the subgraph is deemed stale.
+
+### Example Configuration
+
+Here is a snippet of an Arbitrum network specification file with the suggested options for Arbitrum One and Arbitrum Sepolia:
+
+```yaml
+subgraphs:
+  maxBlockDistance: 5000
+  freshnessSleepMilliseconds: 10000
+```
+
+## Practical Implications
+
+The following default values have been established based on **Arbitrum-One** observations:
+
+- **maxBlockDistance:** 1000 blocks
+- **freshnessSleepMilliseconds:** 10000 (10 seconds)
+
+
+### Potential Risk Warning
+
+Suppose the Agent or Service utilizes the default (Ethereum) settings on Arbitrum networks. In that case, a warning will inform users about the risk that queries may forever be considered non-fresh.
+
+Adjust the `maxBlockDistance` and `freshnessSleepMilliseconds` according to each network condition.
+
+## Disabling this feature
+
+This feature can be virtually turned off by setting a very high value for the **maxBlockDistance** option, which will effectively cause the freshness check always to pass.

docs/testnet-setup.md

@@ -1,17 +1,17 @@
 # Testnet indexer setup
 
-The Graph Network's testnet is on Goerli, and network information can be found at https://testnet.thegraph.com/explorer/network.
+The Graph Network's testnet is on Arbitrum Sepolia, and network information can be found at https://testnet.thegraph.com/explorer/network.
 
 > See [networks/testnet.md](/networks/testnet.md) for the latest releases & configuration information.
 
 ### Registration / Funding (GRT)
 
-In order to participate in the testnet, you'll need Goerli ETH and GRT.
+In order to participate in the testnet, you'll need Sepolia ETH and GRT.
 To be eligible for testnet GRT, you'll need to
 
 1. join [The Graph Discord](https://thegraph.com/discord/),
 2. get the `@testnetindexer` role in the `#roles` channel,
-3. use the `#testnet-goerli-faucet` channel to obtain testnet GRT.
+3. use the `#arbi-sepolia-faucet` channel to obtain testnet GRT.
 
 ### Approving And Staking
 
@@ -23,7 +23,7 @@ indexer. The only requirement is a minimum stake of 100k testnet GRT.
 The Graph Explorer provides an easy way to approve and stake your GRT as an indexer via a web GUI. 
 
 1. Navigate to [the testnet explorer](https://testnet.thegraph.com/)
-2. Login with Metamask and select the `Goerli` network
+2. Login with Metamask and select the `Arbitrum Sepolia` network
 3. Navigate to your profile (click your address/avatar at top right)
 4. Select the `Indexing` tab and hit the `Stake` button
 5. Follow the directions on the staking screen to stake the desired amount 
@@ -41,14 +41,14 @@ cd contracts
 npm install
 npm run compile
 
-./cli/cli.ts -m <indexer-mnemonic> -p <ethereum-goerli-node> \
+./cli/cli.ts -m <indexer-mnemonic> -p <arbitrum-sepolia-node> \
   contracts graphToken approve --account 0x35e3Cb6B317690d662160d5d02A5b364578F62c9 --amount <grt>
 ```
 
 Afterwards, stake this amount:
 
 ```bash
-./cli/cli.ts -m <indexer-mnemonic> -p <ethereum-goerli-node> \
+./cli/cli.ts -m <indexer-mnemonic> -p <arbitrum-sepolia-node> \
   contracts staking stake --amount <grt>
 ```
 
@@ -57,7 +57,7 @@ Afterwards, stake this amount:
 #### Via Graph Explorer
 
 1. Navigate to [the testnet explorer](https://testnet.thegraph.com/)
-2. Login with Metamask and select the `Goerli` network
+2. Login with Metamask and select the `Arbitrum Sepolia` network
 3. Navigate to your settings page (click profile dropdown at top right and select ⚙️ `Settings`)
 4. Navigate to the `Operators` settings (click `Operators` button)
 5. Click `+` to add your operator wallet address
@@ -66,8 +66,8 @@ Afterwards, stake this amount:
 ### Via the Contracts CLI
 
 ```bash
-./cli/cli.ts -m <indexer-mnemonic> -p <ethereum-goerli-node> \
+./cli/cli.ts -m <indexer-mnemonic> -p <arbitrum-sepolia-node> \
   contracts staking setOperator --operator <operator-address> --allowed true
 ```
 
-You are now ready to set up your testnet indexer, visit [networks/testnet.md](/networks/testnet.md) for configuration information.
+You are now ready to set up your testnet indexer, visit [networks/arbitrum-sepolia.md](/networks/arbitrum-sepolia.md) for configuration information.

k8s/base/kustomization.yaml

@@ -11,9 +11,6 @@ resources:
   - query-node/service.yaml
   - indexer-agent/service.yaml
   - indexer-agent/statefulset.yaml
-  - indexer-service/backend_config.yaml
-  - indexer-service/statefulset.yaml
-  - indexer-service/service.yaml
   - shell.yaml
   - nfs.yaml
   - prometheus.yaml

k8s/overlays/kustomization.yaml

@@ -12,9 +12,6 @@ images:
   - name: indexer-agent-image
     newName: ghcr.io/graphprotocol/indexer-agent
     newTag: v0.20.4
-  - name: indexer-service-image
-    newName: ghcr.io/graphprotocol/indexer-service
-    newTag: v0.20.4
   - name: prometheus-image
     newName: prom/prometheus
     newTag: v2.32.1

lerna.json

@@ -4,5 +4,5 @@
   ],
   "npmClient": "yarn",
   "useWorkspaces": true,
-  "version": "0.20.12"
+  "version": "0.22.0"
 }

network-configs/config.yaml

@@ -0,0 +1,27 @@
+networkIdentifier: "arbitrum-sepolia"
+gateway:
+  url: "http://127.0.0.1:8030/"
+networkProvider:
+  url: <network-provider>
+indexerOptions:
+  address: "0xf56b5d582920E4527A818FBDd801C0D80A394CB8"
+  mnemonic: "famous aspect index polar tornado zero wedding electric floor chalk tenant junk"
+  url: "http://test-indexer.xyz"
+subgraphs:
+  maxBlockDistance: 1000000
+  networkSubgraph:
+    url: "https://gateway-arbitrum.network.thegraph.com/api/<api-key>/subgraphs/id/3xQHhMudr1oh69ut36G2mbzpYmYxwqCeU6wwqyCDCnqV"
+  epochSubgraph:
+    url: "http://test-url.xyz"
+  tapSubgraph:
+    url: "https://gateway-arbitrum.network.thegraph.com/api/<api-key>/subgraphs/id/7ubx365MiqBH5iUz6XWXWT8PTof5BVAyEzdb8m17RvbD"
+transactionMonitoring:
+  gasIncreaseTimeout: 240000
+  gasIncreaseFactor: 1.2
+  baseFeePerGasMax: 100000000000
+  maxTransactionAttempts: 0
+tapAddressBook:
+  "421614":
+    TAPVerifier: "0xf56b5d582920E4527A818FBDd801C0D80A394CB8"
+    AllocationIDTracker: "0xf56b5d582920E4527A818FBDd801C0D80A394CB8"
+    Escrow: "0xf56b5d582920E4527A818FBDd801C0D80A394CB8"

package.json

@@ -6,18 +6,16 @@
       "packages/indexer-common",
       "packages/indexer-cli",
       "packages/indexer-agent",
-      "packages/indexer-service",
       "packages/indexer-native"
     ]
   },
   "scripts": {
     "bootstrap": "lerna bootstrap",
     "prepare": "lerna run prepare",
     "release": "./scripts/release.sh",
-    "test": "lerna --concurrency 1 run test --stream --ignore @graphprotocol/indexer-service",
-    "test:ci": "lerna --concurrency 1 run test:ci --stream --ignore @graphprotocol/indexer-service",
-    "update-common-ts": "./scripts/update-common-ts.sh 1.8.3",
-    "clean": "rm -rf ./node_modules && lerna run clean",
+    "test": "lerna --concurrency 1 run test --stream",
+    "test:ci": "lerna --concurrency 1 run test:ci --stream",
+    "clean": "lerna run clean && rm -rf ./node_modules",
     "compile": "lerna run compile"
   },
   "devDependencies": {
@@ -26,22 +24,30 @@
   },
   "resolutions": {
     "ethers": "5.7.0",
-    "sequelize": "6.19.0",
+    "sequelize": "6.33.0",
     "@ethersproject/bignumber": "5.7.0",
     "@ethersproject/providers": "5.7.0",
-    "@urql/core": "2.4.4",
-    "@urql/exchange-execute": "1.2.2"
+    "@urql/core": "3.1.0",
+    "@urql/exchange-execute": "2.1.0",
+    "punycode": "2.3.1",
+    "uri-js": "4.2.2"
   },
   "overrides": {
     "ethers": "5.7.0",
-    "sequelize": "6.19.0",
+    "sequelize": "6.33.0",
     "@ethersproject/bignumber": "5.7.0",
     "@ethersproject/providers": "5.7.0",
-    "@urql/core": "2.4.4",
-    "@urql/exchange-execute": "1.2.2",
-    "graphql": "16.3.0"
+    "@urql/core": "3.1.0",
+    "@urql/exchange-execute": "2.1.0",
+    "graphql": "16.8.0"
   },
   "engines": {
-    "node": ">=12.22.0"
-  }
+    "node": ">=18.0.0"
+  },
+  "jest": {
+    "transformIgnorePatterns": [
+      "node_modules/(?!@thi.ng)"
+    ]
+  },
+  "packageManager": "yarn@1.22.22+sha1.ac34549e6aa8e7ead463a7407e1c7390f61a6610"
 }