Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Import interfaces and lib utils from set-protocol-v2 [SIM-124] #22

Merged
merged 7 commits into from
Mar 25, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion contracts/ManagerCore.sol
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ pragma solidity 0.6.10;

import { Ownable } from "@openzeppelin/contracts/access/Ownable.sol";

import { AddressArrayUtils } from "./lib/AddressArrayUtils.sol";
import { AddressArrayUtils } from "@setprotocol/set-protocol-v2/contracts/lib/AddressArrayUtils.sol";

/**
* @title ManagerCore
Expand Down
6 changes: 3 additions & 3 deletions contracts/extensions/FeeSplitExtension.sol
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@ pragma experimental ABIEncoderV2;
import { Address } from "@openzeppelin/contracts/utils/Address.sol";
import { SafeMath } from "@openzeppelin/contracts/math/SafeMath.sol";

import { ISetToken } from "@setprotocol/set-protocol-v2/contracts/interfaces/ISetToken.sol";
import { PreciseUnitMath } from "@setprotocol/set-protocol-v2/contracts/lib/PreciseUnitMath.sol";
import { IIssuanceModule } from "@setprotocol/set-protocol-v2/contracts/interfaces/IIssuanceModule.sol";
import { IStreamingFeeModule } from "@setprotocol/set-protocol-v2/contracts/interfaces/IStreamingFeeModule.sol";

import { BaseExtension } from "../lib/BaseExtension.sol";
import { IIssuanceModule } from "../interfaces/IIssuanceModule.sol";
import { IBaseManager } from "../interfaces/IBaseManager.sol";
import { ISetToken } from "../interfaces/ISetToken.sol";
import { IStreamingFeeModule } from "../interfaces/IStreamingFeeModule.sol";
import { TimeLockUpgrade } from "../lib/TimeLockUpgrade.sol";


Expand Down
2 changes: 1 addition & 1 deletion contracts/extensions/IssuanceExtension.sol
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@ import { Address } from "@openzeppelin/contracts/utils/Address.sol";
import { SafeMath } from "@openzeppelin/contracts/math/SafeMath.sol";

import { ISetToken } from "@setprotocol/set-protocol-v2/contracts/interfaces/ISetToken.sol";
import { IIssuanceModule } from "@setprotocol/set-protocol-v2/contracts/interfaces/IIssuanceModule.sol";
import { PreciseUnitMath } from "@setprotocol/set-protocol-v2/contracts/lib/PreciseUnitMath.sol";

import { BaseGlobalExtension } from "../lib/BaseGlobalExtension.sol";
import { IDelegatedManager } from "../interfaces/IDelegatedManager.sol";
import { IIssuanceModule } from "../interfaces/IIssuanceModule.sol";
import { IManagerCore } from "../interfaces/IManagerCore.sol";

/**
Expand Down
64 changes: 32 additions & 32 deletions contracts/extensions/PerpV2LeverageStrategyExtension.sol

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion contracts/extensions/StreamingFeeSplitExtension.sol
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@ import { Address } from "@openzeppelin/contracts/utils/Address.sol";
import { SafeMath } from "@openzeppelin/contracts/math/SafeMath.sol";

import { ISetToken } from "@setprotocol/set-protocol-v2/contracts/interfaces/ISetToken.sol";
import { IStreamingFeeModule } from "@setprotocol/set-protocol-v2/contracts/interfaces/IStreamingFeeModule.sol";
import { PreciseUnitMath } from "@setprotocol/set-protocol-v2/contracts/lib/PreciseUnitMath.sol";

import { BaseGlobalExtension } from "../lib/BaseGlobalExtension.sol";
import { IDelegatedManager } from "../interfaces/IDelegatedManager.sol";
import { IManagerCore } from "../interfaces/IManagerCore.sol";
import { IStreamingFeeModule } from "../interfaces/IStreamingFeeModuleV2.sol";

/**
* @title StreamingFeeSplitExtension
Expand Down
2 changes: 1 addition & 1 deletion contracts/extensions/TradeExtension.sol
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@
pragma solidity 0.6.10;

import { ISetToken } from "@setprotocol/set-protocol-v2/contracts/interfaces/ISetToken.sol";
import { ITradeModule } from "@setprotocol/set-protocol-v2/contracts/interfaces/ITradeModule.sol";

import { BaseGlobalExtension } from "../lib/BaseGlobalExtension.sol";
import { IDelegatedManager } from "../interfaces/IDelegatedManager.sol";
import { IManagerCore } from "../interfaces/IManagerCore.sol";
import { ITradeModule } from "../interfaces/ITradeModule.sol";

/**
* @title TradeExtension
Expand Down
7 changes: 4 additions & 3 deletions contracts/factories/DelegatedManagerFactory.sol
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,15 @@ pragma solidity 0.6.10;
pragma experimental ABIEncoderV2;

import { Address } from "@openzeppelin/contracts/utils/Address.sol";

import { AddressArrayUtils } from "@setprotocol/set-protocol-v2/contracts/lib/AddressArrayUtils.sol";
import { IController } from "@setprotocol/set-protocol-v2/contracts/interfaces/IController.sol";
import { ISetToken } from "@setprotocol/set-protocol-v2/contracts/interfaces/ISetToken.sol";
import { ISetTokenCreator } from "@setprotocol/set-protocol-v2/contracts/interfaces/ISetTokenCreator.sol";

import { AddressArrayUtils } from "../lib/AddressArrayUtils.sol";
import { DelegatedManager } from "../manager/DelegatedManager.sol";
import { IController } from "../interfaces/IController.sol";
import { IDelegatedManager } from "../interfaces/IDelegatedManager.sol";
import { IManagerCore } from "../interfaces/IManagerCore.sol";
import { ISetTokenCreator } from "../interfaces/ISetTokenCreator.sol";

/**
* @title DelegatedManagerFactory
Expand Down
4 changes: 2 additions & 2 deletions contracts/hooks/SupplyCapIssuanceHook.sol
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ pragma experimental ABIEncoderV2;
import { Ownable } from "@openzeppelin/contracts/access/Ownable.sol";
import { SafeMath } from "@openzeppelin/contracts/math/SafeMath.sol";

import { IManagerIssuanceHook } from "../interfaces/IManagerIssuanceHook.sol";
import { ISetToken } from "../interfaces/ISetToken.sol";
import { IManagerIssuanceHook } from "@setprotocol/set-protocol-v2/contracts/interfaces/IManagerIssuanceHook.sol";
import { ISetToken } from "@setprotocol/set-protocol-v2/contracts/interfaces/ISetToken.sol";


/**
Expand Down
41 changes: 0 additions & 41 deletions contracts/interfaces/IAccountBalance.sol

This file was deleted.

2 changes: 1 addition & 1 deletion contracts/interfaces/IBaseManager.sol
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
pragma solidity 0.6.10;
pragma experimental "ABIEncoderV2";

import { ISetToken } from "./ISetToken.sol";
import { ISetToken } from "@setprotocol/set-protocol-v2/contracts/interfaces/ISetToken.sol";

interface IBaseManager {
function setToken() external returns(ISetToken);
Expand Down
25 changes: 0 additions & 25 deletions contracts/interfaces/IBasicIssuanceModule.sol

This file was deleted.

24 changes: 0 additions & 24 deletions contracts/interfaces/IController.sol

This file was deleted.

41 changes: 0 additions & 41 deletions contracts/interfaces/IIssuanceModule.sol

This file was deleted.

25 changes: 0 additions & 25 deletions contracts/interfaces/IManagerIssuanceHook.sol

This file was deleted.

45 changes: 0 additions & 45 deletions contracts/interfaces/IPerpV2LeverageModule.sol

This file was deleted.

Loading