Skip to content

chore(ignition): read unchanged artifacts from published contracts 7.3.0 #1391

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Maikol wants to merge 1 commit into
base: feat/contracts-removal-d2b-legacy-addresses
Choose a base branch
from
+47 −21
Draft

chore(ignition): read unchanged artifacts from published contracts 7.3.0 #1391

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions packages/horizon/ignition/modules/core/HorizonStaking.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import GraphProxyArtifact from '@graphprotocol/contracts/artifacts/contracts/upgrades/GraphProxy.sol/GraphProxy.json'
import GraphProxyAdminArtifact from '@graphprotocol/contracts/artifacts/contracts/upgrades/GraphProxyAdmin.sol/GraphProxyAdmin.json'
import GraphProxyArtifact from '@graphprotocol/contracts-7.3.0/artifacts/contracts/upgrades/GraphProxy.sol/GraphProxy.json'
import GraphProxyAdminArtifact from '@graphprotocol/contracts-7.3.0/artifacts/contracts/upgrades/GraphProxyAdmin.sol/GraphProxyAdmin.json'
import { buildModule } from '@nomicfoundation/hardhat-ignition/modules'

import HorizonStakingArtifact from '../../../build/contracts/contracts/staking/HorizonStaking.sol/HorizonStaking.json'
Expand Down
2 changes: 1 addition & 1 deletion packages/horizon/ignition/modules/migrate/migrate-4.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import ControllerArtifact from '@graphprotocol/contracts/artifacts/contracts/governance/Controller.sol/Controller.json'
import ControllerArtifact from '@graphprotocol/contracts-7.3.0/artifacts/contracts/governance/Controller.sol/Controller.json'
import { buildModule } from '@nomicfoundation/hardhat-ignition/modules'
import { ethers } from 'ethers'

Expand Down
2 changes: 1 addition & 1 deletion packages/horizon/ignition/modules/periphery/Controller.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import ControllerArtifact from '@graphprotocol/contracts/artifacts/contracts/governance/Controller.sol/Controller.json'
import ControllerArtifact from '@graphprotocol/contracts-7.3.0/artifacts/contracts/governance/Controller.sol/Controller.json'
import { buildModule } from '@nomicfoundation/hardhat-ignition/modules'
import { ethers } from 'ethers'

Expand Down
6 changes: 3 additions & 3 deletions packages/horizon/ignition/modules/periphery/Curation.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import GraphCurationTokenArtifact from '@graphprotocol/contracts/artifacts/contracts/curation/GraphCurationToken.sol/GraphCurationToken.json'
import CurationArtifact from '@graphprotocol/contracts/artifacts/contracts/l2/curation/L2Curation.sol/L2Curation.json'
import GraphProxyArtifact from '@graphprotocol/contracts/artifacts/contracts/upgrades/GraphProxy.sol/GraphProxy.json'
import GraphProxyAdminArtifact from '@graphprotocol/contracts/artifacts/contracts/upgrades/GraphProxyAdmin.sol/GraphProxyAdmin.json'
import GraphCurationTokenArtifact from '@graphprotocol/contracts-7.3.0/artifacts/contracts/curation/GraphCurationToken.sol/GraphCurationToken.json'
import GraphProxyArtifact from '@graphprotocol/contracts-7.3.0/artifacts/contracts/upgrades/GraphProxy.sol/GraphProxy.json'
import GraphProxyAdminArtifact from '@graphprotocol/contracts-7.3.0/artifacts/contracts/upgrades/GraphProxyAdmin.sol/GraphProxyAdmin.json'
import { buildModule, IgnitionModuleBuilder } from '@nomicfoundation/ignition-core'

import { deployWithGraphProxy, upgradeGraphProxy } from '../proxy/GraphProxy'
Expand Down
2 changes: 1 addition & 1 deletion packages/horizon/ignition/modules/periphery/EpochManager.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import EpochManagerArtifact from '@graphprotocol/contracts/artifacts/contracts/epochs/EpochManager.sol/EpochManager.json'
import EpochManagerArtifact from '@graphprotocol/contracts-7.3.0/artifacts/contracts/epochs/EpochManager.sol/EpochManager.json'
import { buildModule } from '@nomicfoundation/hardhat-ignition/modules'

import { deployWithGraphProxy } from '../proxy/GraphProxy'
Expand Down
4 changes: 2 additions & 2 deletions packages/horizon/ignition/modules/periphery/GNS.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import SubgraphNFTArtifact from '@graphprotocol/contracts/artifacts/contracts/discovery/SubgraphNFT.sol/SubgraphNFT.json'
import SubgraphNFTDescriptorArtifact from '@graphprotocol/contracts/artifacts/contracts/discovery/SubgraphNFTDescriptor.sol/SubgraphNFTDescriptor.json'
import L2GNSArtifact from '@graphprotocol/contracts/artifacts/contracts/l2/discovery/L2GNS.sol/L2GNS.json'
import SubgraphNFTArtifact from '@graphprotocol/contracts-7.3.0/artifacts/contracts/discovery/SubgraphNFT.sol/SubgraphNFT.json'
import SubgraphNFTDescriptorArtifact from '@graphprotocol/contracts-7.3.0/artifacts/contracts/discovery/SubgraphNFTDescriptor.sol/SubgraphNFTDescriptor.json'
import { buildModule } from '@nomicfoundation/hardhat-ignition/modules'

import { deployWithGraphProxy } from '../proxy/GraphProxy'
Expand Down
2 changes: 1 addition & 1 deletion packages/horizon/ignition/modules/periphery/GraphProxyAdmin.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import GraphProxyAdminArtifact from '@graphprotocol/contracts/artifacts/contracts/upgrades/GraphProxyAdmin.sol/GraphProxyAdmin.json'
import GraphProxyAdminArtifact from '@graphprotocol/contracts-7.3.0/artifacts/contracts/upgrades/GraphProxyAdmin.sol/GraphProxyAdmin.json'
import { buildModule } from '@nomicfoundation/hardhat-ignition/modules'

export default buildModule('GraphProxyAdmin', (m) => {
Expand Down
2 changes: 1 addition & 1 deletion packages/horizon/ignition/modules/periphery/GraphToken.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import GraphTokenArtifact from '@graphprotocol/contracts/artifacts/contracts/l2/token/L2GraphToken.sol/L2GraphToken.json'
import GraphTokenArtifact from '@graphprotocol/contracts-7.3.0/artifacts/contracts/l2/token/L2GraphToken.sol/L2GraphToken.json'
import { buildModule } from '@nomicfoundation/hardhat-ignition/modules'

import GraphProxyAdminModule from '../periphery/GraphProxyAdmin'
Expand Down
2 changes: 1 addition & 1 deletion packages/horizon/ignition/modules/periphery/GraphTokenGateway.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import GraphTokenGatewayArtifact from '@graphprotocol/contracts/artifacts/contracts/l2/gateway/L2GraphTokenGateway.sol/L2GraphTokenGateway.json'
import GraphTokenGatewayArtifact from '@graphprotocol/contracts-7.3.0/artifacts/contracts/l2/gateway/L2GraphTokenGateway.sol/L2GraphTokenGateway.json'
import { buildModule } from '@nomicfoundation/ignition-core'

import ControllerModule from '../periphery/Controller'
Expand Down
4 changes: 2 additions & 2 deletions packages/horizon/ignition/modules/periphery/RewardsManager.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import RewardsManagerArtifact from '@graphprotocol/contracts/artifacts/contracts/rewards/RewardsManager.sol/RewardsManager.json'
import GraphProxyArtifact from '@graphprotocol/contracts/artifacts/contracts/upgrades/GraphProxy.sol/GraphProxy.json'
import GraphProxyAdminArtifact from '@graphprotocol/contracts/artifacts/contracts/upgrades/GraphProxyAdmin.sol/GraphProxyAdmin.json'
import GraphProxyArtifact from '@graphprotocol/contracts-7.3.0/artifacts/contracts/upgrades/GraphProxy.sol/GraphProxy.json'
import GraphProxyAdminArtifact from '@graphprotocol/contracts-7.3.0/artifacts/contracts/upgrades/GraphProxyAdmin.sol/GraphProxyAdmin.json'
import { buildModule, IgnitionModuleBuilder } from '@nomicfoundation/ignition-core'

import { deployWithGraphProxy, upgradeGraphProxy } from '../proxy/GraphProxy'
Expand Down
2 changes: 1 addition & 1 deletion packages/horizon/ignition/modules/proxy/GraphProxy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import GraphProxyArtifact from '@graphprotocol/contracts/artifacts/contracts/upgrades/GraphProxy.sol/GraphProxy.json'
import GraphProxyArtifact from '@graphprotocol/contracts-7.3.0/artifacts/contracts/upgrades/GraphProxy.sol/GraphProxy.json'
import {
CallableContractFuture,
ContractFuture,
Expand Down
1 change: 1 addition & 0 deletions packages/horizon/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
},
"devDependencies": {
"@graphprotocol/contracts": "workspace:^",
"@graphprotocol/contracts-7.3.0": "npm:@graphprotocol/contracts@7.3.0",
"@graphprotocol/interfaces": "workspace:^",
"@graphprotocol/toolshed": "workspace:^",
"@nomicfoundation/hardhat-chai-matchers": "^2.0.0",
Expand Down
9 changes: 8 additions & 1 deletion packages/horizon/scripts/pre-verify
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,15 @@
#!/bin/bash

# Move external artifacts
cp -r ../contracts/artifacts/contracts/* build/contracts/contracts
cp -r node_modules/@graphprotocol/contracts-7.3.0/artifacts/contracts/* build/contracts/contracts
cp -r node_modules/@graphprotocol/contracts-7.3.0/artifacts/build-info/* build/contracts/build-info

# RewardsManager, L2Curation and L2GNS are deployed from live artifacts
cp -r ../contracts/artifacts/contracts/rewards/RewardsManager.sol build/contracts/contracts/rewards
cp -r ../contracts/artifacts/contracts/l2/curation/L2Curation.sol build/contracts/contracts/l2/curation
cp -r ../contracts/artifacts/contracts/l2/discovery/L2GNS.sol build/contracts/contracts/l2/discovery
cp -r ../contracts/artifacts/build-info/* build/contracts/build-info

cp -r build/contracts/@openzeppelin/contracts/proxy/transparent/* build/contracts/contracts

# HardHat Ignition deployment ID
Expand Down
2 changes: 1 addition & 1 deletion packages/subgraph-service/ignition/modules/DisputeManager.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import LegacyDisputeManagerArtifact from '@graphprotocol/contracts/artifacts/contracts/disputes/DisputeManager.sol/DisputeManager.json'
import LegacyDisputeManagerArtifact from '@graphprotocol/contracts-7.3.0/artifacts/contracts/disputes/DisputeManager.sol/DisputeManager.json'
import { deployImplementation, upgradeTransparentUpgradeableProxy } from '@graphprotocol/horizon/ignition'
import { buildModule } from '@nomicfoundation/hardhat-ignition/modules'
import ProxyAdminArtifact from '@openzeppelin/contracts/build/contracts/ProxyAdmin.json'
Expand Down
2 changes: 1 addition & 1 deletion packages/subgraph-service/ignition/modules/GNS.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import SubgraphNFTArtifact from '@graphprotocol/contracts/artifacts/contracts/discovery/SubgraphNFT.sol/SubgraphNFT.json'
import L2GNSArtifact from '@graphprotocol/contracts/artifacts/contracts/l2/discovery/L2GNS.sol/L2GNS.json'
import SubgraphNFTArtifact from '@graphprotocol/contracts-7.3.0/artifacts/contracts/discovery/SubgraphNFT.sol/SubgraphNFT.json'
import { buildModule } from '@nomicfoundation/hardhat-ignition/modules'

// Note that this module is a no-op, we only run it to get gns addresses into the address book.
Expand Down
2 changes: 1 addition & 1 deletion packages/subgraph-service/ignition/modules/ServiceRegistry.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import ServiceRegistryArtifact from '@graphprotocol/contracts/artifacts/contracts/discovery/ServiceRegistry.sol/ServiceRegistry.json'
import ServiceRegistryArtifact from '@graphprotocol/contracts-7.3.0/artifacts/contracts/discovery/ServiceRegistry.sol/ServiceRegistry.json'
import { buildModule } from '@nomicfoundation/hardhat-ignition/modules'

export default buildModule('ServiceRegistry', (m) => {
Expand Down
1 change: 1 addition & 0 deletions packages/subgraph-service/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
},
"devDependencies": {
"@graphprotocol/contracts": "workspace:^",
"@graphprotocol/contracts-7.3.0": "npm:@graphprotocol/contracts@7.3.0",
"@graphprotocol/horizon": "workspace:^",
"@graphprotocol/interfaces": "workspace:^",
"@graphprotocol/toolshed": "workspace:^",
Expand Down
8 changes: 7 additions & 1 deletion packages/subgraph-service/scripts/pre-verify
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
#!/bin/bash

# Move external artifacts
cp -r ../contracts/artifacts/contracts/* build/contracts/contracts
cp -r node_modules/@graphprotocol/contracts-7.3.0/artifacts/contracts/* build/contracts/contracts
cp -r node_modules/@graphprotocol/contracts-7.3.0/artifacts/build-info/* build/contracts/build-info

# RewardsManager, L2Curation and L2GNS are deployed from live artifacts
cp -r ../contracts/artifacts/contracts/rewards/RewardsManager.sol build/contracts/contracts/rewards
cp -r ../contracts/artifacts/contracts/l2/curation/L2Curation.sol build/contracts/contracts/l2/curation
cp -r ../contracts/artifacts/contracts/l2/discovery/L2GNS.sol build/contracts/contracts/l2/discovery
cp -r ../contracts/artifacts/build-info/* build/contracts/build-info

cp -r ../horizon/build/contracts/contracts/* build/contracts/contracts
Expand Down
11 changes: 11 additions & 0 deletions pnpm-lock.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading