diff --git a/packages/horizon/ignition/modules/core/HorizonStaking.ts b/packages/horizon/ignition/modules/core/HorizonStaking.ts index ec98c1066..4527d8464 100644 --- a/packages/horizon/ignition/modules/core/HorizonStaking.ts +++ b/packages/horizon/ignition/modules/core/HorizonStaking.ts @@ -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' diff --git a/packages/horizon/ignition/modules/migrate/migrate-4.ts b/packages/horizon/ignition/modules/migrate/migrate-4.ts index bf759942c..78aca8644 100644 --- a/packages/horizon/ignition/modules/migrate/migrate-4.ts +++ b/packages/horizon/ignition/modules/migrate/migrate-4.ts @@ -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' diff --git a/packages/horizon/ignition/modules/periphery/Controller.ts b/packages/horizon/ignition/modules/periphery/Controller.ts index 9ed7e4b61..d79590d5b 100644 --- a/packages/horizon/ignition/modules/periphery/Controller.ts +++ b/packages/horizon/ignition/modules/periphery/Controller.ts @@ -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' diff --git a/packages/horizon/ignition/modules/periphery/Curation.ts b/packages/horizon/ignition/modules/periphery/Curation.ts index ed177fba5..4c9abf9c3 100644 --- a/packages/horizon/ignition/modules/periphery/Curation.ts +++ b/packages/horizon/ignition/modules/periphery/Curation.ts @@ -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' diff --git a/packages/horizon/ignition/modules/periphery/EpochManager.ts b/packages/horizon/ignition/modules/periphery/EpochManager.ts index 2fa4c974f..18d7a2c11 100644 --- a/packages/horizon/ignition/modules/periphery/EpochManager.ts +++ b/packages/horizon/ignition/modules/periphery/EpochManager.ts @@ -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' diff --git a/packages/horizon/ignition/modules/periphery/GNS.ts b/packages/horizon/ignition/modules/periphery/GNS.ts index 4195d803e..78ee364f5 100644 --- a/packages/horizon/ignition/modules/periphery/GNS.ts +++ b/packages/horizon/ignition/modules/periphery/GNS.ts @@ -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' diff --git a/packages/horizon/ignition/modules/periphery/GraphProxyAdmin.ts b/packages/horizon/ignition/modules/periphery/GraphProxyAdmin.ts index 52dd6087d..891960fbb 100644 --- a/packages/horizon/ignition/modules/periphery/GraphProxyAdmin.ts +++ b/packages/horizon/ignition/modules/periphery/GraphProxyAdmin.ts @@ -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) => { diff --git a/packages/horizon/ignition/modules/periphery/GraphToken.ts b/packages/horizon/ignition/modules/periphery/GraphToken.ts index 24d4564cd..198cc3964 100644 --- a/packages/horizon/ignition/modules/periphery/GraphToken.ts +++ b/packages/horizon/ignition/modules/periphery/GraphToken.ts @@ -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' diff --git a/packages/horizon/ignition/modules/periphery/GraphTokenGateway.ts b/packages/horizon/ignition/modules/periphery/GraphTokenGateway.ts index 9caea9f16..8a9825334 100644 --- a/packages/horizon/ignition/modules/periphery/GraphTokenGateway.ts +++ b/packages/horizon/ignition/modules/periphery/GraphTokenGateway.ts @@ -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' diff --git a/packages/horizon/ignition/modules/periphery/RewardsManager.ts b/packages/horizon/ignition/modules/periphery/RewardsManager.ts index 23937c2b3..d288cef8f 100644 --- a/packages/horizon/ignition/modules/periphery/RewardsManager.ts +++ b/packages/horizon/ignition/modules/periphery/RewardsManager.ts @@ -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' diff --git a/packages/horizon/ignition/modules/proxy/GraphProxy.ts b/packages/horizon/ignition/modules/proxy/GraphProxy.ts index f9dc08de9..1e0748945 100644 --- a/packages/horizon/ignition/modules/proxy/GraphProxy.ts +++ b/packages/horizon/ignition/modules/proxy/GraphProxy.ts @@ -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, diff --git a/packages/horizon/package.json b/packages/horizon/package.json index 7662a48a3..1b98592ca 100644 --- a/packages/horizon/package.json +++ b/packages/horizon/package.json @@ -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", diff --git a/packages/horizon/scripts/pre-verify b/packages/horizon/scripts/pre-verify index 80ef14241..88d3adb71 100755 --- a/packages/horizon/scripts/pre-verify +++ b/packages/horizon/scripts/pre-verify @@ -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 diff --git a/packages/subgraph-service/ignition/modules/DisputeManager.ts b/packages/subgraph-service/ignition/modules/DisputeManager.ts index 515d2949f..3ec9a3079 100644 --- a/packages/subgraph-service/ignition/modules/DisputeManager.ts +++ b/packages/subgraph-service/ignition/modules/DisputeManager.ts @@ -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' diff --git a/packages/subgraph-service/ignition/modules/GNS.ts b/packages/subgraph-service/ignition/modules/GNS.ts index 5533ea04f..7e7c0bbb0 100644 --- a/packages/subgraph-service/ignition/modules/GNS.ts +++ b/packages/subgraph-service/ignition/modules/GNS.ts @@ -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. diff --git a/packages/subgraph-service/ignition/modules/ServiceRegistry.ts b/packages/subgraph-service/ignition/modules/ServiceRegistry.ts index 2c4a4cd8d..429652e6b 100644 --- a/packages/subgraph-service/ignition/modules/ServiceRegistry.ts +++ b/packages/subgraph-service/ignition/modules/ServiceRegistry.ts @@ -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) => { diff --git a/packages/subgraph-service/package.json b/packages/subgraph-service/package.json index 1dc7e7e87..8483aabc9 100644 --- a/packages/subgraph-service/package.json +++ b/packages/subgraph-service/package.json @@ -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:^", diff --git a/packages/subgraph-service/scripts/pre-verify b/packages/subgraph-service/scripts/pre-verify index bf880ff79..7a8ad65d9 100755 --- a/packages/subgraph-service/scripts/pre-verify +++ b/packages/subgraph-service/scripts/pre-verify @@ -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 diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index b8d381611..0c532d599 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -644,6 +644,9 @@ importers: '@graphprotocol/contracts': specifier: workspace:^ version: link:../contracts + '@graphprotocol/contracts-7.3.0': + specifier: npm:@graphprotocol/contracts@7.3.0 + version: '@graphprotocol/contracts@7.3.0' '@graphprotocol/interfaces': specifier: workspace:^ version: link:../interfaces @@ -939,6 +942,9 @@ importers: '@graphprotocol/contracts': specifier: workspace:^ version: link:../contracts + '@graphprotocol/contracts-7.3.0': + specifier: npm:@graphprotocol/contracts@7.3.0 + version: '@graphprotocol/contracts@7.3.0' '@graphprotocol/horizon': specifier: workspace:^ version: link:../horizon @@ -2770,6 +2776,9 @@ packages: '@graphprotocol/contracts@2.1.0': resolution: {integrity: sha512-SeymJCUxBp488K/KNi77EKvrkPT0t/7rERGp8zFkmf5KByerjihhE9Ty9oXJAU9RzbUpxsU0JkPBSmiw9/2DYQ==} + '@graphprotocol/contracts@7.3.0': + resolution: {integrity: sha512-uEjgrBN4WCkJhSrUi5O64cNbU5OWI7iwy/03Er9n+J7o3WEspizpLJvSGXql8E0XtI0ygBaHBTwJfPo7SUphkg==} + '@graphprotocol/pino-sentry-simple@0.7.1': resolution: {integrity: sha512-iccKFdFBjarSp8/liXuK1EtGq8Vwn118tqymbOJBxblecRsi4rOebk63qnL+dK/a0IvxH6h2+RjjWDbRt7UsUA==} engines: {node: '>=10'} @@ -12503,6 +12512,8 @@ snapshots: - bufferutil - utf-8-validate + '@graphprotocol/contracts@7.3.0': {} + '@graphprotocol/pino-sentry-simple@0.7.1': dependencies: '@sentry/node': 5.30.0