Skip to content

Commit c6e2785

Browse files
ArvolearArvolear
committed
added decimals, fixed imports
1 parent bc42b81 commit c6e2785

File tree

55 files changed

+1958
-807
lines changed

Some content is hidden

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

55 files changed

+1958
-807
lines changed

‎contracts/access-control/MerkleWhitelisted.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// SPDX-License-Identifier: MIT
22
pragma solidity ^0.8.4;
33

4-
import "@openzeppelin/contracts/utils/cryptography/MerkleProof.sol";
4+
import {MerkleProof} from "@openzeppelin/contracts/utils/cryptography/MerkleProof.sol";
55

66
/**
77
* @notice The Whitelist Access Control module

‎contracts/access-control/RBAC.sol

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
// SPDX-License-Identifier: MIT
22
pragma solidity ^0.8.4;
33

4-
import "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
4+
import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
55

6-
import "../interfaces/access-control/IRBAC.sol";
6+
import {IRBAC} from "../interfaces/access-control/IRBAC.sol";
77

8-
import "../libs/utils/TypeCaster.sol";
9-
import "../libs/arrays/SetHelper.sol";
8+
import {TypeCaster} from "../libs/utils/TypeCaster.sol";
9+
import {SetHelper} from "../libs/arrays/SetHelper.sol";
10+
import {StringSet} from "../libs/data-structures/StringSet.sol";
1011

1112
/**
1213
* @notice The Role Based Access Control (RBAC) module

‎contracts/access-control/extensions/RBACGroupable.sol

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
// SPDX-License-Identifier: MIT
22
pragma solidity ^0.8.4;
33

4-
import "../../interfaces/access-control/extensions/IRBACGroupable.sol";
4+
import {IRBACGroupable} from "../../interfaces/access-control/extensions/IRBACGroupable.sol";
55

6-
import "../RBAC.sol";
6+
import {StringSet} from "../../libs/data-structures/StringSet.sol";
7+
import {SetHelper} from "../../libs/arrays/SetHelper.sol";
8+
9+
import {RBAC} from "../RBAC.sol";
710

811
/**
912
* @notice The Role Based Access Control (RBAC) module

‎contracts/compound-rate-keeper/AbstractCompoundRateKeeper.sol

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
// SPDX-License-Identifier: MIT
22
pragma solidity ^0.8.4;
33

4-
import "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
5-
import "@openzeppelin/contracts/utils/math/Math.sol";
4+
import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
5+
import {Math} from "@openzeppelin/contracts/utils/math/Math.sol";
66

7-
import "../interfaces/compound-rate-keeper/ICompoundRateKeeper.sol";
7+
import {ICompoundRateKeeper} from "../interfaces/compound-rate-keeper/ICompoundRateKeeper.sol";
88

9-
import "../libs/math/DSMath.sol";
9+
import {DSMath} from "../libs/math/DSMath.sol";
1010

11-
import "../utils/Globals.sol";
11+
import {PRECISION} from "../utils/Globals.sol";
1212

1313
/**
1414
* @notice The Compound Rate Keeper module

‎contracts/compound-rate-keeper/presets/OwnableCompoundRateKeeper.sol

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
// SPDX-License-Identifier: MIT
22
pragma solidity ^0.8.4;
33

4-
import "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";
4+
import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";
55

6-
import "../AbstractCompoundRateKeeper.sol";
6+
import {AbstractCompoundRateKeeper} from "../AbstractCompoundRateKeeper.sol";
77

88
/**
99
* @notice The Ownable preset of CompoundRateKeeper

‎contracts/contracts-registry/AbstractContractsRegistry.sol

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
// SPDX-License-Identifier: MIT
22
pragma solidity ^0.8.4;
33

4-
import "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
5-
import "@openzeppelin/contracts/proxy/transparent/TransparentUpgradeableProxy.sol";
4+
import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
5+
import {TransparentUpgradeableProxy} from "@openzeppelin/contracts/proxy/transparent/TransparentUpgradeableProxy.sol";
66

7-
import "./proxy/ProxyUpgrader.sol";
8-
import "./AbstractDependant.sol";
7+
import {ProxyUpgrader} from "./proxy/ProxyUpgrader.sol";
8+
import {AbstractDependant} from "./AbstractDependant.sol";
99

1010
/**
1111
* @notice The ContractsRegistry module

‎contracts/contracts-registry/pools/AbstractPoolContractsRegistry.sol

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
// SPDX-License-Identifier: MIT
22
pragma solidity ^0.8.4;
33

4-
import "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
5-
import "@openzeppelin/contracts/utils/structs/EnumerableSet.sol";
6-
import "@openzeppelin/contracts/utils/math/Math.sol";
4+
import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
5+
import {EnumerableSet} from "@openzeppelin/contracts/utils/structs/EnumerableSet.sol";
6+
import {Math} from "@openzeppelin/contracts/utils/math/Math.sol";
77

8-
import "../../libs/arrays/Paginator.sol";
8+
import {Paginator} from "../../libs/arrays/Paginator.sol";
99

10-
import "../../contracts-registry/AbstractDependant.sol";
10+
import {AbstractDependant} from "../../contracts-registry/AbstractDependant.sol";
1111

12-
import "./proxy/ProxyBeacon.sol";
12+
import {ProxyBeacon} from "./proxy/ProxyBeacon.sol";
1313

1414
/**
1515
* @notice The PoolContractsRegistry module

‎contracts/contracts-registry/pools/pool-factory/AbstractPoolFactory.sol

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
// SPDX-License-Identifier: MIT
22
pragma solidity ^0.8.4;
33

4-
import "@openzeppelin/contracts/utils/Create2.sol";
4+
import {Create2} from "@openzeppelin/contracts/utils/Create2.sol";
55

6-
import "../../../contracts-registry/AbstractDependant.sol";
7-
import "../AbstractPoolContractsRegistry.sol";
6+
import {AbstractDependant} from "../../../contracts-registry/AbstractDependant.sol";
7+
import {AbstractPoolContractsRegistry} from "../AbstractPoolContractsRegistry.sol";
88

9-
import "./proxy/PublicBeaconProxy.sol";
9+
import {PublicBeaconProxy} from "./proxy/PublicBeaconProxy.sol";
1010

1111
/**
1212
* @notice The PoolContractsRegistry module

‎contracts/contracts-registry/pools/pool-factory/proxy/PublicBeaconProxy.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// SPDX-License-Identifier: MIT
22
pragma solidity ^0.8.4;
33

4-
import "@openzeppelin/contracts/proxy/beacon/BeaconProxy.sol";
4+
import {BeaconProxy} from "@openzeppelin/contracts/proxy/beacon/BeaconProxy.sol";
55

66
/**
77
* @notice The PoolContractsRegistry module

‎contracts/contracts-registry/pools/presets/OwnablePoolContractsRegistry.sol

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
// SPDX-License-Identifier: MIT
22
pragma solidity ^0.8.4;
33

4-
import "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";
4+
import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";
55

6-
import "../AbstractPoolContractsRegistry.sol";
6+
import {AbstractPoolContractsRegistry} from "../AbstractPoolContractsRegistry.sol";
77

88
/**
99
* @notice The Ownable preset of PoolContractsRegistry

0 commit comments

Comments
 (0)