Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 24 additions & 0 deletions .changeset/pre.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
{
"mode": "pre",
"tag": "dips",
"initialVersions": {
"@graphprotocol/address-book": "1.1.0",
"@graphprotocol/contracts": "7.3.0",
"@graphprotocol/contracts-tests": "1.0.3",
"@graphprotocol/contracts-task": "1.0.3",
"@graphprotocol/data-edge": "0.3.0",
"@graphprotocol/deployment": "0.1.0",
"hardhat-graph-protocol": "0.2.6",
"@graphprotocol/horizon": "1.1.1",
"@graphprotocol/interfaces": "0.6.6",
"@graphprotocol/issuance": "1.0.0",
"@graphprotocol/issuance-test": "1.0.0",
"@graphprotocol/issuance-test-coverage": "1.0.0",
"@graphprotocol/subgraph-service": "1.1.1",
"@graphprotocol/token-distribution": "2.0.1",
"@graphprotocol/toolshed": "1.1.2"
},
"changesets": [
"add-dips-helpers"
]
}
8 changes: 8 additions & 0 deletions packages/contracts-test/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# @graphprotocol/contracts-tests

## 1.0.4-dips.0

### Patch Changes

- Updated dependencies
- @graphprotocol/interfaces@0.7.0-dips.0
- @graphprotocol/contracts@7.3.0

## 1.0.3

### Patch Changes
Expand Down
2 changes: 1 addition & 1 deletion packages/contracts-test/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@graphprotocol/contracts-tests",
"version": "1.0.3",
"version": "1.0.4-dips.0",
"private": true,
"description": "Tests for @graphprotocol/contracts",
"author": "Edge & Node",
Expand Down
12 changes: 12 additions & 0 deletions packages/deployment/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# @graphprotocol/deployment

## 0.1.1-dips.0

### Patch Changes

- Updated dependencies
- @graphprotocol/toolshed@1.2.0-dips.0
- @graphprotocol/contracts@7.3.0
- @graphprotocol/horizon@1.1.1
- @graphprotocol/issuance@1.0.0
- @graphprotocol/subgraph-service@1.1.1
2 changes: 1 addition & 1 deletion packages/deployment/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@graphprotocol/deployment",
"version": "0.1.0",
"version": "0.1.1-dips.0",
"description": "Unified deployment for Graph Protocol contracts",
"private": true,
"scripts": {
Expand Down
7 changes: 7 additions & 0 deletions packages/hardhat-graph-protocol/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# hardhat-graph-protocol

## 0.2.7-dips.0

### Patch Changes

- Updated dependencies
- @graphprotocol/toolshed@1.2.0-dips.0

## 0.2.6

### Patch Changes
Expand Down
2 changes: 1 addition & 1 deletion packages/hardhat-graph-protocol/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "hardhat-graph-protocol",
"version": "0.2.6",
"version": "0.2.7-dips.0",
"publishConfig": {
"access": "public"
},
Expand Down
5 changes: 5 additions & 0 deletions packages/horizon/ignition/configs/protocol.default.json5
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,11 @@
"eip712Version": "1",
"revokeSignerThawingPeriod": 10000
},
"RecurringCollector": {
"eip712Name": "RecurringCollector",
"eip712Version": "1",
"revokeSignerThawingPeriod": 10000
},
"RewardsManager": {
"issuancePerBlock": "114155251141552511415n"
},
Expand Down
5 changes: 5 additions & 0 deletions packages/horizon/ignition/configs/protocol.localNetwork.json5
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,11 @@
"eip712Version": "1",
"revokeSignerThawingPeriod": 10000
},
"RecurringCollector": {
"eip712Name": "RecurringCollector",
"eip712Version": "1",
"revokeSignerThawingPeriod": 10000
},
"RewardsManager": {
"issuancePerBlock": "114155251141552511415n"
},
Expand Down
43 changes: 43 additions & 0 deletions packages/horizon/ignition/modules/core/RecurringCollector.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
import { buildModule } from '@nomicfoundation/hardhat-ignition/modules'

import RecurringCollectorArtifact from '../../../build/contracts/contracts/payments/collectors/RecurringCollector.sol/RecurringCollector.json'
import GraphPeripheryModule, { MigratePeripheryModule } from '../periphery/periphery'
import HorizonProxiesModule from './HorizonProxies'

export default buildModule('RecurringCollector', (m) => {
const { Controller } = m.useModule(GraphPeripheryModule)

const name = m.getParameter('eip712Name')
const version = m.getParameter('eip712Version')
const revokeSignerThawingPeriod = m.getParameter('revokeSignerThawingPeriod')

const RecurringCollector = m.contract(
'RecurringCollector',
RecurringCollectorArtifact,
[name, version, Controller, revokeSignerThawingPeriod],
{ after: [GraphPeripheryModule, HorizonProxiesModule] },
)

return { RecurringCollector }
})

// Note that this module requires MigrateHorizonProxiesGovernorModule to be executed first
// The dependency is not made explicit to support the production workflow where the governor is a
// multisig owned by the Graph Council.
// For testnet, the dependency can be made explicit by having a parent module establish it.
export const MigrateRecurringCollectorModule = buildModule('RecurringCollector', (m) => {
const { Controller } = m.useModule(MigratePeripheryModule)

const name = m.getParameter('eip712Name')
const version = m.getParameter('eip712Version')
const revokeSignerThawingPeriod = m.getParameter('revokeSignerThawingPeriod')

const RecurringCollector = m.contract('RecurringCollector', RecurringCollectorArtifact, [
name,
version,
Controller,
revokeSignerThawingPeriod,
])

return { RecurringCollector }
})
5 changes: 5 additions & 0 deletions packages/horizon/ignition/modules/core/core.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,15 @@ import { buildModule } from '@nomicfoundation/hardhat-ignition/modules'
import GraphPaymentsModule, { MigrateGraphPaymentsModule } from './GraphPayments'
import GraphTallyCollectorModule, { MigrateGraphTallyCollectorModule } from './GraphTallyCollector'
import HorizonStakingModule, { MigrateHorizonStakingDeployerModule } from './HorizonStaking'
import RecurringCollectorModule, { MigrateRecurringCollectorModule } from './RecurringCollector'
import PaymentsEscrowModule, { MigratePaymentsEscrowModule } from './PaymentsEscrow'

export default buildModule('GraphHorizon_Core', (m) => {
const { HorizonStaking, HorizonStakingImplementation } = m.useModule(HorizonStakingModule)
const { GraphPaymentsProxyAdmin, GraphPayments, GraphPaymentsImplementation } = m.useModule(GraphPaymentsModule)
const { PaymentsEscrowProxyAdmin, PaymentsEscrow, PaymentsEscrowImplementation } = m.useModule(PaymentsEscrowModule)
const { GraphTallyCollector } = m.useModule(GraphTallyCollectorModule)
const { RecurringCollector } = m.useModule(RecurringCollectorModule)

return {
HorizonStaking,
Expand All @@ -21,6 +23,7 @@ export default buildModule('GraphHorizon_Core', (m) => {
PaymentsEscrow,
PaymentsEscrowImplementation,
GraphTallyCollector,
RecurringCollector,
}
})

Expand All @@ -31,6 +34,7 @@ export const MigrateHorizonCoreModule = buildModule('GraphHorizon_Core', (m) =>
const { GraphPayments, GraphPaymentsImplementation } = m.useModule(MigrateGraphPaymentsModule)
const { PaymentsEscrow, PaymentsEscrowImplementation } = m.useModule(MigratePaymentsEscrowModule)
const { GraphTallyCollector } = m.useModule(MigrateGraphTallyCollectorModule)
const { RecurringCollector } = m.useModule(MigrateRecurringCollectorModule)

return {
HorizonStaking,
Expand All @@ -40,5 +44,6 @@ export const MigrateHorizonCoreModule = buildModule('GraphHorizon_Core', (m) =>
PaymentsEscrow,
PaymentsEscrowImplementation,
GraphTallyCollector,
RecurringCollector,
}
})
2 changes: 2 additions & 0 deletions packages/horizon/ignition/modules/deploy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ export default buildModule('GraphHorizon_Deploy', (m) => {
PaymentsEscrow,
PaymentsEscrowImplementation,
GraphTallyCollector,
RecurringCollector,
} = m.useModule(GraphHorizonCoreModule)

const governor = m.getAccount(1)
Expand Down Expand Up @@ -74,5 +75,6 @@ export default buildModule('GraphHorizon_Deploy', (m) => {
Transparent_Proxy_PaymentsEscrow: PaymentsEscrow,
Implementation_PaymentsEscrow: PaymentsEscrowImplementation,
GraphTallyCollector,
RecurringCollector,
}
})
13 changes: 13 additions & 0 deletions packages/interfaces/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,18 @@
# @graphprotocol/interfaces

## 0.7.0-dips.0

### Minor Changes

- Add RecurringCollector support to toolshed and interfaces for DIPs (Distributed Indexing Payments).

**@graphprotocol/interfaces**: Re-export `IRecurringCollector` from horizon types.

**@graphprotocol/toolshed**:
- Add `RecurringCollector: IRecurringCollector` to `GraphHorizonContracts` interface
- Add `encodeCollectIndexingFeesData()` helper for indexing fee collection encoding
- Add `decodeSignedRCA()`, `decodeAcceptIndexingAgreementMetadata()`, `decodeIndexingAgreementTermsV1()` decoders

## 0.6.6

### Patch Changes
Expand Down
2 changes: 1 addition & 1 deletion packages/interfaces/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@graphprotocol/interfaces",
"version": "0.6.6",
"version": "0.7.0-dips.0",
"publishConfig": {
"access": "public"
},
Expand Down
2 changes: 2 additions & 0 deletions packages/interfaces/src/types/horizon.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,13 @@
IL2GNSToolshed,
ILegacyRewardsManager,
IPaymentsEscrowToolshed,
IRecurringCollector,
IRewardsManagerToolshed,
IStaking,
ISubgraphNFT,
} from '../../types'

export {

Check failure on line 19 in packages/interfaces/src/types/horizon.ts

View workflow job for this annotation

GitHub Actions / Lint Files

Run autofix to sort these exports!
IControllerToolshed as Controller,
IEpochManagerToolshed as EpochManager,
IGraphPayments as GraphPayments,
Expand All @@ -29,5 +30,6 @@
IStaking as LegacyStaking,
IPaymentsEscrowToolshed as PaymentsEscrow,
IRewardsManagerToolshed as RewardsManager,
IRecurringCollector,
ISubgraphNFT as SubgraphNFT,
}
8 changes: 8 additions & 0 deletions packages/issuance/testing-coverage/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# @graphprotocol/issuance-test-coverage

## 1.0.1-dips.0

### Patch Changes

- Updated dependencies
- @graphprotocol/interfaces@0.7.0-dips.0
2 changes: 1 addition & 1 deletion packages/issuance/testing-coverage/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@graphprotocol/issuance-test-coverage",
"version": "1.0.0",
"version": "1.0.1-dips.0",
"private": true,
"description": "Coverage testing for @graphprotocol/issuance using Hardhat v2 + solidity-coverage",
"author": "Edge & Node",
Expand Down
10 changes: 10 additions & 0 deletions packages/issuance/testing/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# @graphprotocol/issuance-test

## 1.0.1-dips.0

### Patch Changes

- Updated dependencies
- @graphprotocol/interfaces@0.7.0-dips.0
- @graphprotocol/contracts@7.3.0
- @graphprotocol/issuance@1.0.0
2 changes: 1 addition & 1 deletion packages/issuance/testing/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@graphprotocol/issuance-test",
"version": "1.0.0",
"version": "1.0.1-dips.0",
"type": "module",
"private": true,
"description": "Test utilities for @graphprotocol/issuance",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
"subgraphServiceProxyAddress": "0xb2Bb92d0DE618878E438b55D5846cfecD9301105",
"subgraphServiceProxyAdminAddress": "0x49021Ada0806cabce24b73002EB4477fe4934215",
"graphTallyCollectorAddress": "0x8f69F5C07477Ac46FBc491B1E6D91E2bb0111A9e",
"recurringCollectorAddress": "",
"curationImplementationAddress": "0xc4Ce508c8fda35C597CC78e3604261110fc4c957"
},
"DisputeManager": {
Expand All @@ -34,5 +35,6 @@
"stakeToFeesRatio": 10,
"maxPOIStaleness": 2419200,
"curationCut": 100000,
"indexingFeesCut": 100000,
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
"subgraphServiceProxyAddress": "0xc24A3dAC5d06d771f657A48B20cE1a671B78f26b",
"subgraphServiceProxyAdminAddress": "0x15737D9f8635cAcd43e110327c930bd5EC1fe098",
"graphTallyCollectorAddress": "0x382863e7B662027117449bd2c49285582bbBd21B",
"recurringCollectorAddress": "",
"curationImplementationAddress": "0xbC8F4355f346e47eef8A0DBFF4a58616ACf7DaCA",
},
"DisputeManager": {
Expand All @@ -34,5 +35,6 @@
"stakeToFeesRatio": 10,
"maxPOIStaleness": 28800,
"curationCut": 100000,
"indexingFeesCut": 100000,
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
"subgraphServiceProxyAddress": "",
"subgraphServiceProxyAdminAddress": "",
"graphTallyCollectorAddress": "",
"recurringCollectorAddress": "",
"curationImplementationAddress": ""
},
"DisputeManager": {
Expand All @@ -34,5 +35,6 @@
"stakeToFeesRatio": 2,
"maxPOIStaleness": 2419200, // 28 days = 2419200 seconds
"curationCut": 100000,
"indexingFeesCut": 100000,
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@
"disputeManagerProxyAdminAddress": "",
"subgraphServiceProxyAddress": "",
"subgraphServiceProxyAdminAddress": "",
"graphTallyCollectorAddress": ""
"graphTallyCollectorAddress": "",
"recurringCollectorAddress": ""
},
"DisputeManager": {
"disputePeriod": 2419200,
Expand All @@ -34,5 +35,6 @@
"stakeToFeesRatio": 2,
"maxPOIStaleness": 2419200, // 28 days = 2419200 seconds
"curationCut": 100000,
"indexingFeesCut": 100000,
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@
"disputeManagerProxyAdminAddress": "",
"subgraphServiceProxyAddress": "",
"subgraphServiceProxyAdminAddress": "",
"graphTallyCollectorAddress": ""
"graphTallyCollectorAddress": "",
"recurringCollectorAddress": ""
},
"DisputeManager": {
"disputePeriod": 7200,
Expand All @@ -34,5 +35,6 @@
"stakeToFeesRatio": 2,
"maxPOIStaleness": 7200, // 28 days = 2419200 seconds
"curationCut": 100000,
"indexingFeesCut": 100000,
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@
"disputeManagerProxyAdminAddress": "",
"subgraphServiceProxyAddress": "",
"subgraphServiceProxyAdminAddress": "",
"graphTallyCollectorAddress": ""
"graphTallyCollectorAddress": "",
"recurringCollectorAddress": ""
},
"DisputeManager": {
"disputePeriod": 2419200,
Expand All @@ -37,5 +38,6 @@
"stakeToFeesRatio": 2,
"maxPOIStaleness": 2419200, // 28 days = 2419200 seconds
"curationCut": 100000,
"indexingFeesCut": 100000,
}
}
Loading
Loading