Skip to content

Commit

Permalink
fix: minor interface fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
lekhovitsky committed Jan 15, 2025
1 parent 8524424 commit 3a8d308
Show file tree
Hide file tree
Showing 10 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion contracts/factories/AbstractMarketFactory.sol
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ pragma solidity ^0.8.23;
import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";
import {IPoolQuotaKeeperV3} from "@gearbox-protocol/core-v3/contracts/interfaces/IPoolQuotaKeeperV3.sol";
import {IPoolV3} from "@gearbox-protocol/core-v3/contracts/interfaces/IPoolV3.sol";
import {IContractsRegister} from "../interfaces/extensions/IContractsRegister.sol";
import {IMarketFactory} from "../interfaces/factories/IMarketFactory.sol";
import {IContractsRegister} from "../interfaces/IContractsRegister.sol";
import {IMarketConfigurator} from "../interfaces/IMarketConfigurator.sol";
import {Call} from "../interfaces/Types.sol";
import {AbstractFactory} from "./AbstractFactory.sol";
Expand Down
2 changes: 1 addition & 1 deletion contracts/factories/CreditFactory.sol
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ import {ICreditFacadeV3} from "@gearbox-protocol/core-v3/contracts/interfaces/IC
import {ICreditManagerV3} from "@gearbox-protocol/core-v3/contracts/interfaces/ICreditManagerV3.sol";
import {IPoolV3} from "@gearbox-protocol/core-v3/contracts/interfaces/IPoolV3.sol";

import {IContractsRegister} from "../interfaces/extensions/IContractsRegister.sol";
import {ICreditFactory} from "../interfaces/factories/ICreditFactory.sol";
import {IFactory} from "../interfaces/factories/IFactory.sol";
import {IContractsRegister} from "../interfaces/IContractsRegister.sol";
import {IMarketConfigurator} from "../interfaces/IMarketConfigurator.sol";
import {Call, DeployParams, DeployResult} from "../interfaces/Types.sol";

Expand Down
2 changes: 1 addition & 1 deletion contracts/instance/MarketConfiguratorFactory.sol
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ pragma solidity ^0.8.23;
import {Address} from "@openzeppelin/contracts/utils/Address.sol";
import {EnumerableSet} from "@openzeppelin/contracts/utils/structs/EnumerableSet.sol";

import {IContractsRegister} from "../interfaces/extensions/IContractsRegister.sol";
import {IContractsRegister} from "../interfaces/IContractsRegister.sol";
import {IMarketConfigurator} from "../interfaces/IMarketConfigurator.sol";
import {IMarketConfiguratorFactory} from "../interfaces/IMarketConfiguratorFactory.sol";

Expand Down
File renamed without changes.
6 changes: 3 additions & 3 deletions contracts/interfaces/IAddressProvider.sol
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
// (c) Gearbox Foundation, 2024.
pragma solidity ^0.8.23;

import {IAddressProvider as IAddressProviderBase} from
"@gearbox-protocol/core-v3/contracts/interfaces/base/IAddressProvider.sol";
import {IVersion} from "@gearbox-protocol/core-v3/contracts/interfaces/base/IVersion.sol";
import {IImmutableOwnableTrait} from "./base/IImmutableOwnableTrait.sol";

Expand All @@ -13,15 +15,13 @@ struct ContractValue {
}

/// @title Address provider interface
interface IAddressProvider is IVersion, IImmutableOwnableTrait {
interface IAddressProvider is IAddressProviderBase, IVersion, IImmutableOwnableTrait {
event SetAddress(string indexed key, uint256 indexed version, address indexed value);

function addresses(string memory key, uint256 _version) external view returns (address);

function getAddressOrRevert(string memory key, uint256 _version) external view returns (address);

function getAddressOrRevert(bytes32 key, uint256 _version) external view returns (address);

function getAllSavedContracts() external view returns (ContractValue[] memory);

function getLatestVersion(string memory key) external view returns (uint256);
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion contracts/market/ACL.sol
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ pragma solidity ^0.8.23;
import {Ownable2Step} from "@openzeppelin/contracts/access/Ownable2Step.sol";
import {EnumerableSet} from "@openzeppelin/contracts/utils/structs/EnumerableSet.sol";

import {IACL} from "../interfaces/extensions/IACL.sol";
import {IACL} from "../interfaces/IACL.sol";
import {AP_ACL} from "../libraries/ContractLiterals.sol";

/// @title Access control list
Expand Down
2 changes: 1 addition & 1 deletion contracts/market/ContractsRegister.sol
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import {ICreditManagerV3} from "@gearbox-protocol/core-v3/contracts/interfaces/I
import {ACLTrait} from "@gearbox-protocol/core-v3/contracts/traits/ACLTrait.sol";
import {SanityCheckTrait} from "@gearbox-protocol/core-v3/contracts/traits/SanityCheckTrait.sol";

import {IContractsRegister} from "../interfaces/extensions/IContractsRegister.sol";
import {IContractsRegister} from "../interfaces/IContractsRegister.sol";
import {AP_CONTRACTS_REGISTER} from "../libraries/ContractLiterals.sol";

/// @title Contracts register
Expand Down
4 changes: 2 additions & 2 deletions contracts/market/MarketConfigurator.sol
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ import {IPoolFactory} from "../interfaces/factories/IPoolFactory.sol";
import {IPriceOracleFactory} from "../interfaces/factories/IPriceOracleFactory.sol";
import {IRateKeeperFactory} from "../interfaces/factories/IRateKeeperFactory.sol";

import {IACL} from "../interfaces/extensions/IACL.sol";
import {IContractsRegister} from "../interfaces/extensions/IContractsRegister.sol";
import {IACL} from "../interfaces/IACL.sol";
import {IAddressProvider} from "../interfaces/IAddressProvider.sol";
import {IBytecodeRepository} from "../interfaces/IBytecodeRepository.sol";
import {IContractsRegister} from "../interfaces/IContractsRegister.sol";
import {IGovernor} from "../interfaces/IGovernor.sol";
import {IMarketConfigurator} from "../interfaces/IMarketConfigurator.sol";
import {Call, DeployParams, DeployResult, MarketFactories} from "../interfaces/Types.sol";
Expand Down
4 changes: 2 additions & 2 deletions contracts/market/legacy/MarketConfiguratorLegacy.sol
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ import {IPoolV3} from "@gearbox-protocol/core-v3/contracts/interfaces/IPoolV3.so

import {DefaultLossPolicy} from "../../helpers/DefaultLossPolicy.sol";

import {IACL} from "../../interfaces/extensions/IACL.sol";
import {IContractsRegister} from "../../interfaces/extensions/IContractsRegister.sol";
import {IACL} from "../../interfaces/IACL.sol";
import {IContractsRegister} from "../../interfaces/IContractsRegister.sol";
import {Call, MarketFactories} from "../../interfaces/Types.sol";

import {
Expand Down

0 comments on commit 3a8d308

Please sign in to comment.