fix: merge fixes

Signed-off-by: Tomás Migone <[email protected]>

Author: tmigone

packages/horizon/README.md

@@ -2,6 +2,18 @@
 
 Graph Horizon is the next evolution of the Graph Protocol.
 
+## Configuration
+
+The following environment variables might be required:
+
+- `ETHERSCAN_API_KEY`: Etherscan API key
+
+You can set them using Hardhat:
+
+```bash
+npx hardhat vars set ETHERSCAN_API_KEY
+```
+
 ## Deployment 
 
 We use Hardhat Ignition to deploy the contracts. To build and deploy Graph Horizon run the following commands:

packages/horizon/hardhat.config.ts

@@ -1,15 +1,18 @@
+import { vars } from 'hardhat/config'
+import type { HardhatUserConfig } from 'hardhat/config'
+
+// Hardhat plugins
 import '@nomicfoundation/hardhat-foundry'
 import '@nomicfoundation/hardhat-toolbox'
 import '@nomicfoundation/hardhat-ignition-ethers'
 import '@tenderly/hardhat-tenderly'
 import 'hardhat-storage-layout'
 import 'hardhat-contract-sizer'
 import 'hardhat-secure-accounts'
-import * as dotenv from 'dotenv'
-
-import type { HardhatUserConfig } from 'hardhat/config'
 
-dotenv.config()
+// Environment variables
+const ETHERSCAN_API_KEY = vars.get('ETHERSCAN_API_KEY', '')
+const ARBITRUM_VIRTUAL_TESTNET_URL = vars.get('ARBITRUM_VIRTUAL_TESTNET_URL', '')
 
 const getNetworkAccounts = () => {
   const accounts: string[] = []
@@ -57,7 +60,7 @@ const config: HardhatUserConfig = {
         enabled: false,
       },
       chainId: 421615,
-      url: process.env.ARBITRUM_VIRTUAL_TESTNET_URL || '',
+      url: ARBITRUM_VIRTUAL_TESTNET_URL,
       accounts: getNetworkAccounts(),
     },
   },
@@ -74,7 +77,7 @@ const config: HardhatUserConfig = {
   },
   etherscan: {
     apiKey: {
-      arbitrumSepolia: process.env.ETHERSCAN_API_KEY ?? '',
+      arbitrumSepolia: ETHERSCAN_API_KEY,
     },
     customChains: [
       {

packages/horizon/ignition/modules/core/HorizonProxies.ts

@@ -18,14 +18,13 @@ export default buildModule('HorizonProxies', (m) => {
   const isMigrate = m.getParameter('isMigrate', false)
 
   // Deploy HorizonStaking proxy without an implementation
-  let HorizonStakingProxy, setProxyHorizonStaking
+  let HorizonStakingProxy
   if (isMigrate) {
     const horizonStakingProxyAddress = m.getParameter('horizonStakingProxyAddress')
     HorizonStakingProxy = m.contractAt('GraphProxy', GraphProxyArtifact, horizonStakingProxyAddress, { id: 'GraphProxy_HorizonStaking' })
-    setProxyHorizonStaking = HorizonStakingProxy
   } else {
     HorizonStakingProxy = m.contract('GraphProxy', GraphProxyArtifact, [ZERO_ADDRESS, GraphProxyAdmin], { id: 'GraphProxy_HorizonStaking' })
-    setProxyHorizonStaking = m.call(Controller, 'setContractProxy', [ethers.keccak256(ethers.toUtf8Bytes('Staking')), HorizonStakingProxy], { id: 'setContractProxy_HorizonStaking' })
+    m.call(Controller, 'setContractProxy', [ethers.keccak256(ethers.toUtf8Bytes('Staking')), HorizonStakingProxy], { id: 'setContractProxy_HorizonStaking' })
   }
 
   // Deploy proxies for payments contracts using OZ TransparentUpgradeableProxy

packages/horizon/package.json

@@ -31,6 +31,8 @@
     "@nomicfoundation/ignition-core": "^0.15.9",
     "@openzeppelin/contracts": "^5.0.2",
     "@openzeppelin/contracts-upgradeable": "^5.0.2",
+    "@tenderly/api-client": "^1.1.0",
+    "@tenderly/hardhat-tenderly": "^2.5.2",
     "@typechain/ethers-v6": "^0.5.0",
     "@typechain/hardhat": "^9.0.0",
     "@types/chai": "^4.2.0",
@@ -70,10 +72,5 @@
     "**/*.json": [
       "yarn lint:ts"
     ]
-  },
-  "dependencies": {
-    "@tenderly/api-client": "^1.1.0",
-    "@tenderly/hardhat-tenderly": "^2.5.1",
-    "dotenv": "^16.4.7"
   }
 }