Skip to content

Commit b5fc680

Browse files
committed
fix: update contracts to allow compilation from horizon package
Signed-off-by: Tomás Migone <[email protected]>
1 parent c0e83cf commit b5fc680

File tree

132 files changed

+275
-220
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

132 files changed

+275
-220
lines changed

packages/contracts/contracts/base/IMulticall.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// SPDX-License-Identifier: GPL-2.0-or-later
22

3-
pragma solidity ^0.7.6;
3+
pragma solidity ^0.7.6 || 0.8.27;
44
pragma abicoder v2;
55

66
/**

packages/contracts/contracts/discovery/IServiceRegistry.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// SPDX-License-Identifier: GPL-2.0-or-later
22

3-
pragma solidity ^0.7.6;
3+
pragma solidity ^0.7.6 || 0.8.27;
44

55
interface IServiceRegistry {
66
struct IndexerService {

packages/contracts/contracts/disputes/IDisputeManager.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// SPDX-License-Identifier: GPL-2.0-or-later
22

3-
pragma solidity ^0.7.6;
3+
pragma solidity >=0.6.12 <0.8.0 || 0.8.27;
44
pragma abicoder v2;
55

66
interface IDisputeManager {

packages/contracts/contracts/l2/curation/IL2Curation.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// SPDX-License-Identifier: GPL-2.0-or-later
22

3-
pragma solidity ^0.7.6;
3+
pragma solidity ^0.7.6 || 0.8.27;
44

55
/**
66
* @title Interface of the L2 Curation contract.

packages/contracts/contracts/l2/discovery/IL2GNS.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// SPDX-License-Identifier: GPL-2.0-or-later
22

3-
pragma solidity ^0.7.6;
3+
pragma solidity ^0.7.6 || 0.8.27;
44

55
import { ICallhookReceiver } from "../../gateway/ICallhookReceiver.sol";
66

packages/contracts/contracts/l2/staking/L2Staking.sol

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import { Staking } from "../../staking/Staking.sol";
88
import { IL2StakingBase } from "./IL2StakingBase.sol";
99
import { IL2Staking } from "./IL2Staking.sol";
1010
import { Stakes } from "../../staking/libs/Stakes.sol";
11+
import { IStakes } from "../../staking/libs/IStakes.sol";
1112
import { IL2StakingTypes } from "./IL2StakingTypes.sol";
1213

1314
/**
@@ -18,7 +19,7 @@ import { IL2StakingTypes } from "./IL2StakingTypes.sol";
1819
*/
1920
contract L2Staking is Staking, IL2StakingBase {
2021
using SafeMath for uint256;
21-
using Stakes for Stakes.Indexer;
22+
using Stakes for IStakes.Indexer;
2223

2324
/// @dev Minimum amount of tokens that can be delegated
2425
uint256 private constant MINIMUM_DELEGATION = 1e18;

packages/contracts/contracts/staking/IStaking.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// SPDX-License-Identifier: GPL-2.0-or-later
22

3-
pragma solidity >=0.6.12 <0.8.0;
3+
pragma solidity >=0.6.12 <0.8.0 || 0.8.27;
44
pragma abicoder v2;
55

66
import { IStakingBase } from "./IStakingBase.sol";

packages/contracts/contracts/staking/IStakingBase.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// SPDX-License-Identifier: GPL-2.0-or-later
22

3-
pragma solidity >=0.6.12 <0.8.0;
3+
pragma solidity >=0.6.12 <0.8.0 || 0.8.27;
44
pragma abicoder v2;
55

66
import { IStakingData } from "./IStakingData.sol";

packages/contracts/contracts/staking/IStakingData.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// SPDX-License-Identifier: GPL-2.0-or-later
22

3-
pragma solidity >=0.6.12 <0.8.0;
3+
pragma solidity >=0.6.12 <0.8.0 || 0.8.27;
44

55
/**
66
* @title Staking Data interface

packages/contracts/contracts/staking/IStakingExtension.sol

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
// SPDX-License-Identifier: GPL-2.0-or-later
22

3-
pragma solidity >=0.6.12 <0.8.0;
3+
pragma solidity >=0.6.12 <0.8.0 || 0.8.27;
44
pragma abicoder v2;
55

66
import { IStakingData } from "./IStakingData.sol";
7-
import { Stakes } from "./libs/Stakes.sol";
7+
import { IStakes } from "./libs/IStakes.sol";
88

99
/**
1010
* @title Interface for the StakingExtension contract
@@ -276,11 +276,11 @@ interface IStakingExtension is IStakingData {
276276

277277
/**
278278
* @notice Getter for stakes[_indexer]:
279-
* gets the stake information for an indexer as a Stakes.Indexer struct.
279+
* gets the stake information for an indexer as a IStakes.Indexer struct.
280280
* @param _indexer Indexer address for which to query the stake information
281-
* @return Stake information for the specified indexer, as a Stakes.Indexer struct
281+
* @return Stake information for the specified indexer, as a IStakes.Indexer struct
282282
*/
283-
function stakes(address _indexer) external view returns (Stakes.Indexer memory);
283+
function stakes(address _indexer) external view returns (IStakes.Indexer memory);
284284

285285
/**
286286
* @notice Getter for allocations[_allocationID]:

0 commit comments

Comments
 (0)