Skip to content

Commit 2dab450

Browse files
thedavidmeisterthedavidmeister
committed
wip on compile
1 parent 176caab commit 2dab450

19 files changed

+25
-51
lines changed

‎src/abstract/ReceiptVault.sol‎

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,9 @@
33
pragma solidity =0.8.25;
44

55
import {ERC20Upgradeable as ERC20} from "openzeppelin-contracts-upgradeable/contracts/token/ERC20/ERC20Upgradeable.sol";
6-
import {ReentrancyGuardUpgradeable as ReentrancyGuard} from
7-
"openzeppelin-contracts-upgradeable/contracts/security/ReentrancyGuardUpgradeable.sol";
8-
import {IERC20} from
9-
"openzeppelin-contracts/contracts/token/ERC20/IERC20.sol";
10-
import {SafeERC20} from
11-
"openzeppelin-contracts/contracts/token/ERC20/utils/SafeERC20.sol";
6+
import {ReentrancyGuard} from "openzeppelin-contracts/contracts/utils/ReentrancyGuard.sol";
7+
import {IERC20} from "openzeppelin-contracts/contracts/token/ERC20/IERC20.sol";
8+
import {SafeERC20} from "openzeppelin-contracts/contracts/token/ERC20/utils/SafeERC20.sol";
129
import {MulticallUpgradeable as Multicall} from
1310
"openzeppelin-contracts-upgradeable/contracts/utils/MulticallUpgradeable.sol";
1411
import {IReceiptVaultV3, IReceiptVaultV1, IReceiptV3} from "../interface/IReceiptVaultV3.sol";
@@ -33,8 +30,7 @@ import {
3330
import {UnmanagedReceiptTransfer} from "../interface/IReceiptManagerV2.sol";
3431
import {ERC165Upgradeable as ERC165} from
3532
"openzeppelin-contracts-upgradeable/contracts/utils/introspection/ERC165Upgradeable.sol";
36-
import {IERC20Metadata} from
37-
"openzeppelin-contracts/contracts/token/ERC20/extensions/IERC20Metadata.sol";
33+
import {IERC20Metadata} from "openzeppelin-contracts/contracts/token/ERC20/extensions/IERC20Metadata.sol";
3834

3935
/// Represents the action being taken on shares, ostensibly for calculating a
4036
/// ratio.
@@ -156,7 +152,6 @@ abstract contract ReceiptVault is
156152
// forge-lint: disable-next-line(mixed-case-function)
157153
function __ReceiptVault_init(VaultConfig memory config) internal virtual {
158154
__Multicall_init();
159-
__ReentrancyGuard_init();
160155
__ERC20_init(config.name, config.symbol);
161156
sAsset = IERC20(config.asset);
162157

‎src/concrete/authorize/OffchainAssetReceiptVaultAuthorizerV1.sol‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@ import {IAuthorizeV1, Unauthorized} from "../../interface/IAuthorizeV1.sol";
66

77
import {AccessControlUpgradeable as AccessControl} from
88
"openzeppelin-contracts-upgradeable/contracts/access/AccessControlUpgradeable.sol";
9-
import {IAccessControl} from
10-
"openzeppelin-contracts/contracts/access/IAccessControl.sol";
9+
import {IAccessControl} from "openzeppelin-contracts/contracts/access/IAccessControl.sol";
1110
import {ICloneableV2, ICLONEABLE_V2_SUCCESS} from "rain.factory/interface/ICloneableV2.sol";
1211
import {
1312
CONFISCATE_RECEIPT,
@@ -20,8 +19,7 @@ import {
2019
TransferSharesStateChange,
2120
TransferReceiptStateChange
2221
} from "../vault/OffchainAssetReceiptVault.sol";
23-
import {IERC165} from
24-
"openzeppelin-contracts/contracts/utils/introspection/IERC165.sol";
22+
import {IERC165} from "openzeppelin-contracts/contracts/utils/introspection/IERC165.sol";
2523

2624
/// Thrown when the admin is address zero.
2725
error ZeroInitialAdmin();

‎src/concrete/authorize/OffchainAssetReceiptVaultPaymentMintAuthorizerV1.sol‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,11 @@ pragma solidity =0.8.25;
55
import {IAuthorizeV1, Unauthorized} from "../../interface/IAuthorizeV1.sol";
66

77
import {ICloneableV2, ICLONEABLE_V2_SUCCESS} from "rain.factory/interface/ICloneableV2.sol";
8-
import {SafeERC20} from
9-
"openzeppelin-contracts/contracts/token/ERC20/utils/SafeERC20.sol";
10-
import {IERC20} from
11-
"openzeppelin-contracts/contracts/token/ERC20/IERC20.sol";
8+
import {SafeERC20} from "openzeppelin-contracts/contracts/token/ERC20/utils/SafeERC20.sol";
9+
import {IERC20} from "openzeppelin-contracts/contracts/token/ERC20/IERC20.sol";
1210
import {DEPOSIT, DepositStateChange} from "../vault/OffchainAssetReceiptVault.sol";
1311
import {OwnableUpgradeable as Ownable} from "openzeppelin-contracts-upgradeable/contracts/access/OwnableUpgradeable.sol";
14-
import {IERC20Metadata} from
15-
"openzeppelin-contracts/contracts/token/ERC20/extensions/IERC20Metadata.sol";
12+
import {IERC20Metadata} from "openzeppelin-contracts/contracts/token/ERC20/extensions/IERC20Metadata.sol";
1613
import {
1714
OffchainAssetReceiptVaultAuthorizerV1,
1815
OffchainAssetReceiptVaultAuthorizerV1Config,

‎src/concrete/receipt/Receipt.sol‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@ import {IReceiptVaultV3} from "../../interface/IReceiptVaultV3.sol";
1010
import {OnlyManager} from "../../error/ErrReceipt.sol";
1111
import {ERC1155Upgradeable as ERC1155} from
1212
"openzeppelin-contracts-upgradeable/contracts/token/ERC1155/ERC1155Upgradeable.sol";
13-
import {IERC20Metadata} from
14-
"openzeppelin-contracts/contracts/token/ERC20/extensions/IERC20Metadata.sol";
13+
import {IERC20Metadata} from "openzeppelin-contracts/contracts/token/ERC20/extensions/IERC20Metadata.sol";
1514
import {Base64} from "openzeppelin-contracts/contracts/utils/Base64.sol";
1615
import {Strings} from "openzeppelin-contracts/contracts/utils/Strings.sol";
1716

‎src/concrete/vault/OffchainAssetReceiptVault.sol‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@ import {
1313
} from "../../abstract/ReceiptVault.sol";
1414
import {Math} from "openzeppelin-contracts/contracts/utils/math/Math.sol";
1515
import {IAuthorizeV1, Unauthorized} from "../../interface/IAuthorizeV1.sol";
16-
import {IERC165} from
17-
"openzeppelin-contracts/contracts/utils/introspection/IERC165.sol";
16+
import {IERC165} from "openzeppelin-contracts/contracts/utils/introspection/IERC165.sol";
1817

1918
import {ZeroInitialAdmin} from "../authorize/OffchainAssetReceiptVaultAuthorizerV1.sol";
2019
import {OwnerFreezable} from "../../abstract/OwnerFreezable.sol";

‎src/interface/IOwnerFreezableV1.sol‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22
// SPDX-FileCopyrightText: Copyright (c) 2020 Rain Open Source Software Ltd
33
pragma solidity ^0.8.25;
44

5-
import {IERC5313} from
6-
"openzeppelin-contracts/contracts/interfaces/IERC5313.sol";
5+
import {IERC5313} from "openzeppelin-contracts/contracts/interfaces/IERC5313.sol";
76

87
/// @title IOwnerFreezableV1
98
/// @notice Interface for the OwnerFreezable contract.

‎src/interface/IReceiptV3.sol‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22
// SPDX-FileCopyrightText: Copyright (c) 2020 Rain Open Source Software Ltd
33
pragma solidity =0.8.25;
44

5-
import {IERC1155} from
6-
"openzeppelin-contracts/contracts/token/ERC1155/IERC1155.sol";
5+
import {IERC1155} from "openzeppelin-contracts/contracts/token/ERC1155/IERC1155.sol";
76

87
/// @title IReceiptV3
98
/// @notice IReceiptV3 is an extension to IERC1155 that requires implementers to

‎src/interface/deprecated/IReceiptV1.sol‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22
// SPDX-FileCopyrightText: Copyright (c) 2020 Rain Open Source Software Ltd
33
pragma solidity =0.8.25;
44

5-
import {IERC1155} from
6-
"openzeppelin-contracts/contracts/token/ERC1155/IERC1155.sol";
5+
import {IERC1155} from "openzeppelin-contracts/contracts/token/ERC1155/IERC1155.sol";
76

87
/// @title IReceiptV1
98
/// @notice IReceiptV1 is an extension to IERC1155 that requires implementers to

‎src/interface/deprecated/IReceiptV2.sol‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22
// SPDX-FileCopyrightText: Copyright (c) 2020 Rain Open Source Software Ltd
33
pragma solidity =0.8.25;
44

5-
import {IERC1155} from
6-
"openzeppelin-contracts/contracts/token/ERC1155/IERC1155.sol";
5+
import {IERC1155} from "openzeppelin-contracts/contracts/token/ERC1155/IERC1155.sol";
76

87
/// @title IReceiptV2
98
/// @notice IReceiptV2 is an extension to IERC1155 that requires implementers to

‎test/abstract/OffchainAssetReceiptVaultAuthorizerV1Test.sol‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@ import {
1010
TRANSFER_RECEIPT,
1111
CertificationExpired
1212
} from "src/concrete/authorize/OffchainAssetReceiptVaultAuthorizerV1.sol";
13-
import {IAccessControl} from
14-
"openzeppelin-contracts/contracts/access/IAccessControl.sol";
13+
import {IAccessControl} from "openzeppelin-contracts/contracts/access/IAccessControl.sol";
1514
import {TransferSharesStateChange, TransferReceiptStateChange} from "src/concrete/vault/OffchainAssetReceiptVault.sol";
1615

1716
contract OffchainAssetReceiptVaultAuthorizerV1Test is Test {

0 commit comments

Comments
 (0)