diff --git a/packages/horizon/contracts/interfaces/IBridgeEscrow.sol b/packages/horizon/contracts/interfaces/IBridgeEscrow.sol deleted file mode 100644 index 4e0021423..000000000 --- a/packages/horizon/contracts/interfaces/IBridgeEscrow.sol +++ /dev/null @@ -1,26 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-or-later - -pragma solidity 0.8.26; - -/** - * @title IBridgeEscrow - */ -interface IBridgeEscrow { - /** - * @notice Initialize the BridgeEscrow contract. - * @param controller Address of the Controller that manages this contract - */ - function initialize(address controller) external; - - /** - * @notice Approve a spender (i.e. a bridge that manages the GRT funds held by the escrow) - * @param spender Address of the spender that will be approved - */ - function approveAll(address spender) external; - - /** - * @notice Revoke a spender (i.e. a bridge that will no longer manage the GRT funds held by the escrow) - * @param spender Address of the spender that will be revoked - */ - function revokeAll(address spender) external; -} diff --git a/packages/horizon/contracts/libraries/Denominations.sol b/packages/horizon/contracts/libraries/Denominations.sol index ae3adab94..fe5cf2d05 100644 --- a/packages/horizon/contracts/libraries/Denominations.sol +++ b/packages/horizon/contracts/libraries/Denominations.sol @@ -8,6 +8,7 @@ pragma solidity 0.8.26; */ library Denominations { /// @notice The address of the native token, i.e ETH + /// @dev This convention is taken from https://eips.ethereum.org/EIPS/eip-7528 address internal constant NATIVE_TOKEN = 0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE; /** diff --git a/packages/horizon/contracts/utilities/GraphDirectory.sol b/packages/horizon/contracts/utilities/GraphDirectory.sol index 570a5d476..b63bcdeab 100644 --- a/packages/horizon/contracts/utilities/GraphDirectory.sol +++ b/packages/horizon/contracts/utilities/GraphDirectory.sol @@ -11,7 +11,6 @@ import { IController } from "@graphprotocol/contracts/contracts/governance/ICont import { IEpochManager } from "@graphprotocol/contracts/contracts/epochs/IEpochManager.sol"; import { IRewardsManager } from "@graphprotocol/contracts/contracts/rewards/IRewardsManager.sol"; import { ITokenGateway } from "@graphprotocol/contracts/contracts/arbitrum/ITokenGateway.sol"; -import { IBridgeEscrow } from "../interfaces/IBridgeEscrow.sol"; import { IGraphProxyAdmin } from "../interfaces/IGraphProxyAdmin.sol"; import { ICuration } from "@graphprotocol/contracts/contracts/curation/ICuration.sol"; @@ -52,9 +51,6 @@ abstract contract GraphDirectory { /// @notice The Token Gateway contract address ITokenGateway private immutable GRAPH_TOKEN_GATEWAY; - /// @notice The Bridge Escrow contract address - IBridgeEscrow private immutable GRAPH_BRIDGE_ESCROW; - /// @notice The Graph Proxy Admin contract address IGraphProxyAdmin private immutable GRAPH_PROXY_ADMIN; @@ -73,7 +69,6 @@ abstract contract GraphDirectory { * @param graphEpochManager The Epoch Manager contract address * @param graphRewardsManager The Rewards Manager contract address * @param graphTokenGateway The Token Gateway contract address - * @param graphBridgeEscrow The Bridge Escrow contract address * @param graphProxyAdmin The Graph Proxy Admin contract address * @param graphCuration The Curation contract address */ @@ -86,7 +81,6 @@ abstract contract GraphDirectory { address graphEpochManager, address graphRewardsManager, address graphTokenGateway, - address graphBridgeEscrow, address graphProxyAdmin, address graphCuration ); @@ -118,7 +112,6 @@ abstract contract GraphDirectory { GRAPH_EPOCH_MANAGER = IEpochManager(_getContractFromController("EpochManager")); GRAPH_REWARDS_MANAGER = IRewardsManager(_getContractFromController("RewardsManager")); GRAPH_TOKEN_GATEWAY = ITokenGateway(_getContractFromController("GraphTokenGateway")); - GRAPH_BRIDGE_ESCROW = IBridgeEscrow(_getContractFromController("BridgeEscrow")); GRAPH_PROXY_ADMIN = IGraphProxyAdmin(_getContractFromController("GraphProxyAdmin")); GRAPH_CURATION = ICuration(_getContractFromController("Curation")); @@ -131,7 +124,6 @@ abstract contract GraphDirectory { address(GRAPH_EPOCH_MANAGER), address(GRAPH_REWARDS_MANAGER), address(GRAPH_TOKEN_GATEWAY), - address(GRAPH_BRIDGE_ESCROW), address(GRAPH_PROXY_ADMIN), address(GRAPH_CURATION) ); @@ -193,13 +185,6 @@ abstract contract GraphDirectory { return GRAPH_TOKEN_GATEWAY; } - /** - * @notice Get the Bridge Escrow contract - */ - function _graphBridgeEscrow() internal view returns (IBridgeEscrow) { - return GRAPH_BRIDGE_ESCROW; - } - /** * @notice Get the Graph Proxy Admin contract */ diff --git a/packages/horizon/eslint.config.js b/packages/horizon/eslint.config.js index 2cb4335fd..c9e06b116 100644 --- a/packages/horizon/eslint.config.js +++ b/packages/horizon/eslint.config.js @@ -16,6 +16,6 @@ module.exports = [ }, }, { - ignores: ['typechain-types/*'], + ignores: ['typechain-types/*', 'lib/*'], }, ] diff --git a/packages/horizon/package.json b/packages/horizon/package.json index e6001d96c..a214e1d0a 100644 --- a/packages/horizon/package.json +++ b/packages/horizon/package.json @@ -2,7 +2,7 @@ "name": "@graphprotocol/horizon", "version": "0.0.1", "description": "", - "author": "The Graph Team", + "author": "The Graph core devs", "license": "GPL-2.0-or-later", "scripts": { "lint:ts": "eslint '**/*.{js,ts}' --fix", diff --git a/packages/horizon/test/GraphBase.t.sol b/packages/horizon/test/GraphBase.t.sol index c7f57197a..b978fba2d 100644 --- a/packages/horizon/test/GraphBase.t.sol +++ b/packages/horizon/test/GraphBase.t.sol @@ -142,7 +142,6 @@ abstract contract GraphBaseTest is Utils, Constants { controller.setContractProxy(keccak256("RewardsManager"), address(rewardsManager)); controller.setContractProxy(keccak256("Curation"), address(curation)); controller.setContractProxy(keccak256("GraphTokenGateway"), makeAddr("GraphTokenGateway")); - controller.setContractProxy(keccak256("BridgeEscrow"), makeAddr("BridgeEscrow")); controller.setContractProxy(keccak256("GraphProxyAdmin"), address(proxyAdmin)); resetPrank(users.deployer); diff --git a/packages/horizon/test/utilities/GraphDirectory.t.sol b/packages/horizon/test/utilities/GraphDirectory.t.sol index 6a2c958b8..35ab2a291 100644 --- a/packages/horizon/test/utilities/GraphDirectory.t.sol +++ b/packages/horizon/test/utilities/GraphDirectory.t.sol @@ -19,7 +19,6 @@ contract GraphDirectoryTest is GraphBaseTest { _getContractFromController("EpochManager"), _getContractFromController("RewardsManager"), _getContractFromController("GraphTokenGateway"), - _getContractFromController("BridgeEscrow"), _getContractFromController("GraphProxyAdmin"), _getContractFromController("Curation") ); @@ -49,7 +48,6 @@ contract GraphDirectoryTest is GraphBaseTest { assertEq(_getContractFromController("EpochManager"), address(directory.graphEpochManager())); assertEq(_getContractFromController("RewardsManager"), address(directory.graphRewardsManager())); assertEq(_getContractFromController("GraphTokenGateway"), address(directory.graphTokenGateway())); - assertEq(_getContractFromController("BridgeEscrow"), address(directory.graphBridgeEscrow())); assertEq(_getContractFromController("GraphProxyAdmin"), address(directory.graphProxyAdmin())); assertEq(_getContractFromController("Curation"), address(directory.graphCuration())); } diff --git a/packages/horizon/test/utilities/GraphDirectoryImplementation.sol b/packages/horizon/test/utilities/GraphDirectoryImplementation.sol index 9f4b5066c..57780f450 100644 --- a/packages/horizon/test/utilities/GraphDirectoryImplementation.sol +++ b/packages/horizon/test/utilities/GraphDirectoryImplementation.sol @@ -11,7 +11,6 @@ import { IController } from "@graphprotocol/contracts/contracts/governance/ICont import { IEpochManager } from "@graphprotocol/contracts/contracts/epochs/IEpochManager.sol"; import { IRewardsManager } from "@graphprotocol/contracts/contracts/rewards/IRewardsManager.sol"; import { ITokenGateway } from "@graphprotocol/contracts/contracts/arbitrum/ITokenGateway.sol"; -import { IBridgeEscrow } from "../../contracts/interfaces/IBridgeEscrow.sol"; import { IGraphProxyAdmin } from "../../contracts/interfaces/IGraphProxyAdmin.sol"; import { ICuration } from "@graphprotocol/contracts/contracts/curation/ICuration.sol"; @@ -55,10 +54,6 @@ contract GraphDirectoryImplementation is GraphDirectory { return _graphTokenGateway(); } - function graphBridgeEscrow() external view returns (IBridgeEscrow) { - return _graphBridgeEscrow(); - } - function graphProxyAdmin() external view returns (IGraphProxyAdmin) { return _graphProxyAdmin(); } diff --git a/packages/subgraph-service/package.json b/packages/subgraph-service/package.json index b591a4d41..a90790742 100644 --- a/packages/subgraph-service/package.json +++ b/packages/subgraph-service/package.json @@ -2,7 +2,7 @@ "name": "@graphprotocol/subgraph-service", "version": "0.0.1", "description": "", - "author": "The Graph Team", + "author": "The Graph core devs", "license": "GPL-2.0-or-later", "scripts": { "lint:ts": "eslint '**/*.{js,ts}' --fix",