fix: cleanup from rebase

Author: Maikol

packages/subgraph-service/hardhat.config.ts

@@ -22,7 +22,7 @@ const config: HardhatUserConfig = {
     settings: {
       optimizer: {
         enabled: true,
-        runs: 1,
+        runs: 50,
       },
     },
   },

packages/subgraph-service/scripts/test/integration

@@ -59,22 +59,25 @@ if [ "$SUBGRAPH_DEPLOYMENT_EXISTS" = true ] || [ "$HORIZON_DEPLOYMENT_EXISTS" =
     fi
 fi
 
+# Check required env variables
+BLOCKCHAIN_RPC=${BLOCKCHAIN_RPC:-$(npx hardhat vars get ARBITRUM_SEPOLIA_RPC)}
+if [ -z "$BLOCKCHAIN_RPC" ]; then
+    echo "BLOCKCHAIN_RPC environment variable is required"
+    exit 1
+fi
+
+echo "Starting integration tests..."
+
 # Check if hardhat node is already running on port 8545
 STARTED_NODE=false
 if lsof -i:8545 > /dev/null 2>&1; then
     echo "Hardhat node already running on port 8545, using existing node"
     # Get the PID of the process using port 8545
     NODE_PID=$(lsof -t -i:8545)
 else
-    # Check required env variables only if we need to start the node
-    if [ -z "$ARBITRUM_SEPOLIA_RPC" ]; then
-        echo "ARBITRUM_SEPOLIA_RPC environment variable is required to start hardhat node"
-        exit 1
-    fi
-
     # Start local hardhat node forked from Arbitrum Sepolia
     echo "Starting local hardhat node..."
-    npx hardhat node --fork $ARBITRUM_SEPOLIA_RPC > node.log 2>&1 &
+    npx hardhat node --fork $BLOCKCHAIN_RPC > node.log 2>&1 &
     NODE_PID=$!
     STARTED_NODE=true
 
@@ -114,9 +117,9 @@ npx hardhat deploy:migrate --network localhost --step 2 --subgraph-service-confi
 cd ../horizon
 npx hardhat deploy:migrate --network localhost --horizon-config e2e-test --step 4 --patch-config --account-index 1 --hide-banner
 
-# Run Subgraph Service post-upgrade steps
+# Run Subgraph Service seed steps
 cd ../subgraph-service
-npx hardhat test:post-upgrade --network localhost
+npx hardhat test:seed --network localhost
 
 # Run integration tests - During transition period
 npx hardhat test:integration --phase during-transition-period --network localhost

packages/subgraph-service/tasks/test/post-upgrade.ts renamed to packages/subgraph-service/tasks/test/seed.ts

@@ -6,7 +6,7 @@ import { IHorizonStaking } from '@graphprotocol/horizon'
 
 import { indexers } from './fixtures/indexers'
 
-task('test:post-upgrade', 'Test the post-upgrade state for integration tests')
+task('test:seed', 'Seed the test environment, must be run after deployment')
   .setAction(async (_, hre) => {
     // Get contracts
     const graph = hre.graph()

packages/subgraph-service/test/integration/after-transition-period/dispute-manager/governance.test.ts

@@ -20,11 +20,8 @@ describe('DisputeManager Governance', () => {
     disputeManager = graph.subgraphService.contracts.DisputeManager as unknown as DisputeManager
 
     // Get signers
-    const signers = await ethers.getSigners()
-    governor = signers[1]
-    nonOwner = signers[2]
-    newArbitrator = signers[3]
-    newSubgraphService = signers[4]
+    governor = await graph.accounts.getGovernor()
+    ;[nonOwner, newArbitrator, newSubgraphService] = await graph.accounts.getTestAccounts()
   })
 
   beforeEach(async () => {

packages/subgraph-service/test/integration/after-transition-period/dispute-manager/indexing-disputes.test.ts

@@ -37,9 +37,8 @@ describe('Indexing Disputes', () => {
     subgraphService = graph.subgraphService.contracts.SubgraphService as unknown as SubgraphService
 
     // Get signers
-    const signers = await ethers.getSigners()
-    fisherman = signers[0]
-    arbitrator = signers[2]
+    arbitrator = await graph.accounts.getArbitrator()
+    ;[fisherman] = await graph.accounts.getTestAccounts()
 
     // Get indexer
     const indexerFixture = indexers[0]

packages/subgraph-service/test/integration/after-transition-period/dispute-manager/query-conflict-disputes.test.ts

@@ -42,9 +42,8 @@ describe('Query Conflict Disputes', () => {
     subgraphService = graph.subgraphService.contracts.SubgraphService as unknown as SubgraphService
 
     // Get signers
-    const signers = await ethers.getSigners()
-    fisherman = signers[0]
-    arbitrator = signers[2]
+    arbitrator = await graph.accounts.getArbitrator()
+    ;[fisherman] = await graph.accounts.getTestAccounts()
 
     // Get indexers
     const indexerFixture = indexers[0]

packages/subgraph-service/test/integration/after-transition-period/dispute-manager/query-disputes.test.ts

@@ -41,9 +41,8 @@ describe('Query Disputes', () => {
     subgraphService = graph.subgraphService.contracts.SubgraphService as unknown as SubgraphService
 
     // Get signers
-    const signers = await ethers.getSigners()
-    fisherman = signers[0]
-    arbitrator = signers[2]
+    arbitrator = await graph.accounts.getArbitrator()
+    ;[fisherman] = await graph.accounts.getTestAccounts()
 
     // Get indexer
     const indexerFixture = indexers[0]

packages/subgraph-service/test/integration/after-transition-period/subgraph-service/governance.test.ts

@@ -1,6 +1,5 @@
 import { ethers } from 'hardhat'
 import { expect } from 'chai'
-import { HDNodeWallet } from 'ethers'
 import hre from 'hardhat'
 
 import { SignerWithAddress } from '@nomicfoundation/hardhat-ethers/signers'
@@ -12,20 +11,16 @@ describe('Subgraph Service Governance', () => {
 
   // Test addresses
   let governor: SignerWithAddress
-  let nonOwner: HDNodeWallet
-  let pauseGuardian: HDNodeWallet
+  let nonOwner: SignerWithAddress
+  let pauseGuardian: SignerWithAddress
 
   before(async () => {
     const graph = hre.graph()
     subgraphService = graph.subgraphService.contracts.SubgraphService as unknown as SubgraphService
 
     // Get signers
-    const signers = await ethers.getSigners()
-    governor = signers[1]
-    nonOwner = ethers.Wallet.createRandom()
-    nonOwner = nonOwner.connect(ethers.provider)
-    pauseGuardian = ethers.Wallet.createRandom()
-    pauseGuardian = pauseGuardian.connect(ethers.provider)
+    governor = await graph.accounts.getGovernor()
+    ;[nonOwner, pauseGuardian] = await graph.accounts.getTestAccounts()
 
     // Set eth balance for non-owner and pause guardian
     await ethers.provider.send('hardhat_setBalance', [nonOwner.address, '0x56BC75E2D63100000'])

packages/subgraph-service/test/integration/after-transition-period/subgraph-service/operator.test.ts

@@ -1,6 +1,5 @@
 import { ethers } from 'hardhat'
 import { expect } from 'chai'
-import { HDNodeWallet } from 'ethers'
 import hre from 'hardhat'
 
 import { DisputeManager, IGraphToken, IHorizonStaking, IPaymentsEscrow, SubgraphService } from '../../../../typechain-types'
@@ -24,8 +23,8 @@ describe('Operator', () => {
 
   // Test addresses
   let indexer: SignerWithAddress
-  let authorizedOperator: HDNodeWallet
-  let unauthorizedOperator: HDNodeWallet
+  let authorizedOperator: SignerWithAddress
+  let unauthorizedOperator: SignerWithAddress
   let allocationId: string
   let subgraphDeploymentId: string
   let allocationTokens: bigint
@@ -34,24 +33,14 @@ describe('Operator', () => {
   const { provision } = graph.horizon.actions
   const { collect, generateAllocationProof } = graph.subgraphService.actions
 
-  before(async () => {
+  before(() => {
     // Get contracts
     subgraphService = graph.subgraphService.contracts.SubgraphService as unknown as SubgraphService
     staking = graph.horizon.contracts.HorizonStaking as unknown as IHorizonStaking
     graphToken = graph.horizon.contracts.GraphToken as unknown as IGraphToken
     escrow = graph.horizon.contracts.PaymentsEscrow as unknown as IPaymentsEscrow
     graphTallyCollector = graph.horizon.contracts.GraphTallyCollector as unknown as GraphTallyCollector
     disputeManager = graph.subgraphService.contracts.DisputeManager as unknown as DisputeManager
-
-    // Get signers
-    authorizedOperator = ethers.Wallet.createRandom()
-    authorizedOperator = authorizedOperator.connect(ethers.provider)
-    unauthorizedOperator = ethers.Wallet.createRandom()
-    unauthorizedOperator = unauthorizedOperator.connect(ethers.provider)
-
-    // Set balances for authorized operator
-    await ethers.provider.send('hardhat_setBalance', [authorizedOperator.address, '0x56BC75E2D63100000'])
-    await ethers.provider.send('hardhat_setBalance', [unauthorizedOperator.address, '0x56BC75E2D63100000'])
   })
 
   beforeEach(async () => {
@@ -67,8 +56,11 @@ describe('Operator', () => {
   describe('New indexer', () => {
     beforeEach(async () => {
       // Get indexer
-      const signers = await ethers.getSigners()
-      indexer = await ethers.getSigner(signers[19].address)
+      [indexer, authorizedOperator, unauthorizedOperator] = await graph.accounts.getTestAccounts()
+
+      // Set balances for operators
+      await ethers.provider.send('hardhat_setBalance', [authorizedOperator.address, '0x56BC75E2D63100000'])
+      await ethers.provider.send('hardhat_setBalance', [unauthorizedOperator.address, '0x56BC75E2D63100000'])
 
       // Create provision
       const disputePeriod = await disputeManager.getDisputePeriod()
@@ -124,6 +116,8 @@ describe('Operator', () => {
       // Get indexer
       const indexerFixture = indexers[0]
       indexer = await ethers.getSigner(indexerFixture.address)
+
+      ;[authorizedOperator, unauthorizedOperator] = await graph.accounts.getTestAccounts()
     })
 
     describe('New allocation', () => {

packages/subgraph-service/test/integration/after-transition-period/subgraph-service/paused.test.ts

@@ -34,23 +34,15 @@ describe('Paused Protocol', () => {
     subgraphService = graph.subgraphService.contracts.SubgraphService as unknown as SubgraphService
 
     // Get signers
-    const signers = await ethers.getSigners()
-    pauseGuardian = signers[3]
+    pauseGuardian = await graph.accounts.getPauseGuardian()
   })
 
   beforeEach(async () => {
     // Take a snapshot before each test
     snapshotId = await ethers.provider.send('evm_snapshot', [])
 
     // Get indexer
-    const signers = await ethers.getSigners()
-    indexer = signers[18]
-
-    // Get allocation
-    const wallet = ethers.Wallet.createRandom()
-    allocationId = wallet.address
-    subgraphDeploymentId = indexers[0].allocations[0].subgraphDeploymentID
-    allocationTokens = 1000n
+    ;[indexer] = await graph.accounts.getTestAccounts()
   })
 
   afterEach(async () => {
@@ -193,8 +185,7 @@ describe('Paused Protocol', () => {
     describe('New indexer', () => {
       beforeEach(async () => {
         // Get indexer
-        const signers = await ethers.getSigners()
-        indexer = await ethers.getSigner(signers[19].address)
+        [indexer] = await graph.accounts.getTestAccounts()
 
         // Create provision
         const disputePeriod = await disputeManager.getDisputePeriod()
@@ -225,8 +216,7 @@ describe('Paused Protocol', () => {
 
       before(async () => {
         // Get anyone address
-        const signers = await ethers.getSigners()
-        anyone = signers[3]
+        [anyone] = await graph.accounts.getTestAccounts()
       })
 
       it('should not allow anyone to close a stale allocation while paused', async () => {

packages/subgraph-service/test/integration/after-transition-period/subgraph-service/permisionless.test.ts

@@ -26,8 +26,7 @@ describe('Permissionless', () => {
     subgraphService = graph.subgraphService.contracts.SubgraphService as unknown as SubgraphService
 
     // Get anyone address
-    const signers = await ethers.getSigners()
-    anyone = signers[3]
+    ;[anyone] = await graph.accounts.getTestAccounts()
   })
 
   beforeEach(async () => {

packages/subgraph-service/test/integration/during-transition-period/governance.test.ts

@@ -17,9 +17,9 @@ describe('Governance', () => {
   let allocationId: string
   let subgraphDeploymentId: string
 
-  before(() => {
-    const graph = hre.graph()
+  const graph = hre.graph()
 
+  before(() => {
     subgraphService = graph.subgraphService.contracts.SubgraphService as unknown as ISubgraphService
     // Get proxy admin with SubgraphServiceInterface
   })
@@ -29,10 +29,8 @@ describe('Governance', () => {
     snapshotId = await ethers.provider.send('evm_snapshot', [])
 
     // Get signers
-    const signers = await ethers.getSigners()
-    governor = signers[1]
-    indexer = signers[2]
-    nonOwner = signers[3]
+    governor = await graph.accounts.getGovernor()
+    ;[indexer, nonOwner] = await graph.accounts.getTestAccounts()
 
     // Generate test addresses
     allocationId = ethers.Wallet.createRandom().address

packages/subgraph-service/test/integration/during-transition-period/indexer.test.ts

@@ -26,8 +26,7 @@ describe('Indexer', () => {
     subgraphService = graph.subgraphService.contracts.SubgraphService as unknown as ISubgraphService
 
     // Get governor and non-owner
-    const signers = await ethers.getSigners()
-    governor = signers[1]
+    governor = await graph.accounts.getGovernor()
   })
 
   beforeEach(async () => {

packages/toolshed/src/core/attestations.ts

@@ -1,4 +1,4 @@
-import { ethers, HDNodeWallet, Wallet } from "ethers"
+import { ethers, Wallet } from "ethers"
 
 import { IDisputeManager } from "@graphprotocol/subgraph-service"
 
@@ -13,7 +13,7 @@ import { IDisputeManager } from "@graphprotocol/subgraph-service"
  */
 export async function createAttestationData(
   disputeManager: IDisputeManager,
-  signer: Wallet | HDNodeWallet,
+  signer: Wallet,
   requestCID: string,
   responseCID: string,
   subgraphDeploymentId: string

packages/toolshed/src/deployments/subgraph-service/actions.ts

@@ -1,4 +1,4 @@
-import { ethers, HDNodeWallet, Wallet } from 'ethers'
+import { ethers } from 'ethers'
 
 import type { ISubgraphService } from '@graphprotocol/subgraph-service'
 import type { HardhatEthersSigner } from '@nomicfoundation/hardhat-ethers/signers'
@@ -13,7 +13,7 @@ export function loadActions(contracts: { SubgraphService: ISubgraphService }) {
      *   - `[indexer, paymentType, data]` - The collect parameters
      * @returns The payment collected
      */
-    collect: (signer: HardhatEthersSigner | HDNodeWallet, args: Parameters<ISubgraphService['collect']>): Promise<bigint> => collect(contracts, signer, args),
+    collect: (signer: HardhatEthersSigner, args: Parameters<ISubgraphService['collect']>): Promise<bigint> => collect(contracts, signer, args),
 
     /**
      * Generates an allocation proof for the subgraph services
@@ -29,7 +29,7 @@ export function loadActions(contracts: { SubgraphService: ISubgraphService }) {
 // Collects payment from the subgraph service
 async function collect(
   contracts: { SubgraphService: ISubgraphService },
-  signer: HardhatEthersSigner | HDNodeWallet,
+  signer: HardhatEthersSigner,
   args: Parameters<ISubgraphService['collect']>,
 ): Promise<bigint> {
   const { SubgraphService } = contracts