Skip to content

Commit 67d4d98

Browse files
thedavidmeisterthedavidmeister
committed
wip on build
1 parent 6e03f7d commit 67d4d98

23 files changed

+55
-55
lines changed

‎src/abstract/ReceiptVault.sol‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ pragma solidity =0.8.25;
55
import {ERC20Upgradeable as ERC20} from "openzeppelin-contracts-upgradeable/contracts/token/ERC20/ERC20Upgradeable.sol";
66
import {ReentrancyGuardUpgradeable as ReentrancyGuard} from
77
"openzeppelin-contracts-upgradeable/contracts/security/ReentrancyGuardUpgradeable.sol";
8-
import {IERC20Upgradeable as IERC20} from
9-
"openzeppelin-contracts-upgradeable/contracts/token/ERC20/IERC20Upgradeable.sol";
10-
import {SafeERC20Upgradeable as SafeERC20} from
11-
"openzeppelin-contracts-upgradeable/contracts/token/ERC20/utils/SafeERC20Upgradeable.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";
1212
import {MulticallUpgradeable as Multicall} from
1313
"openzeppelin-contracts-upgradeable/contracts/utils/MulticallUpgradeable.sol";
1414
import {IReceiptVaultV3, IReceiptVaultV1, IReceiptV3} from "../interface/IReceiptVaultV3.sol";
@@ -33,8 +33,8 @@ import {
3333
import {UnmanagedReceiptTransfer} from "../interface/IReceiptManagerV2.sol";
3434
import {ERC165Upgradeable as ERC165} from
3535
"openzeppelin-contracts-upgradeable/contracts/utils/introspection/ERC165Upgradeable.sol";
36-
import {IERC20MetadataUpgradeable as IERC20Metadata} from
37-
"openzeppelin-contracts-upgradeable/contracts/token/ERC20/extensions/IERC20MetadataUpgradeable.sol";
36+
import {IERC20Metadata} from
37+
"openzeppelin-contracts/contracts/token/ERC20/extensions/IERC20Metadata.sol";
3838

3939
/// Represents the action being taken on shares, ostensibly for calculating a
4040
/// ratio.

‎src/concrete/authorize/OffchainAssetReceiptVaultAuthorizerV1.sol‎

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

77
import {AccessControlUpgradeable as AccessControl} from
88
"openzeppelin-contracts-upgradeable/contracts/access/AccessControlUpgradeable.sol";
9-
import {IAccessControlUpgradeable as IAccessControl} from
10-
"openzeppelin-contracts-upgradeable/contracts/access/IAccessControlUpgradeable.sol";
9+
import {IAccessControl} from
10+
"openzeppelin-contracts/contracts/access/IAccessControl.sol";
1111
import {ICloneableV2, ICLONEABLE_V2_SUCCESS} from "rain.factory/interface/ICloneableV2.sol";
1212
import {
1313
CONFISCATE_RECEIPT,
@@ -20,8 +20,8 @@ import {
2020
TransferSharesStateChange,
2121
TransferReceiptStateChange
2222
} from "../vault/OffchainAssetReceiptVault.sol";
23-
import {IERC165Upgradeable as IERC165} from
24-
"openzeppelin-contracts-upgradeable/contracts/utils/introspection/IERC165Upgradeable.sol";
23+
import {IERC165} from
24+
"openzeppelin-contracts/contracts/utils/introspection/IERC165.sol";
2525

2626
/// Thrown when the admin is address zero.
2727
error ZeroInitialAdmin();

‎src/concrete/authorize/OffchainAssetReceiptVaultPaymentMintAuthorizerV1.sol‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@ 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 {SafeERC20Upgradeable as SafeERC20} from
9-
"openzeppelin-contracts-upgradeable/contracts/token/ERC20/utils/SafeERC20Upgradeable.sol";
10-
import {IERC20Upgradeable as IERC20} from
11-
"openzeppelin-contracts-upgradeable/contracts/token/ERC20/IERC20Upgradeable.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";
1212
import {DEPOSIT, DepositStateChange} from "../vault/OffchainAssetReceiptVault.sol";
1313
import {OwnableUpgradeable as Ownable} from "openzeppelin-contracts-upgradeable/contracts/access/OwnableUpgradeable.sol";
14-
import {IERC20MetadataUpgradeable as IERC20Metadata} from
15-
"openzeppelin-contracts-upgradeable/contracts/token/ERC20/extensions/IERC20MetadataUpgradeable.sol";
14+
import {IERC20Metadata} from
15+
"openzeppelin-contracts/contracts/token/ERC20/extensions/IERC20Metadata.sol";
1616
import {
1717
OffchainAssetReceiptVaultAuthorizerV1,
1818
OffchainAssetReceiptVaultAuthorizerV1Config,

‎src/concrete/receipt/ERC20PriceOracleReceipt.sol‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import {
1010
Math
1111
} from "rain.math.fixedpoint/lib/LibFixedPointDecimalArithmeticOpenZeppelin.sol";
1212
import {FIXED_POINT_ONE} from "rain.math.fixedpoint/lib/FixedPointDecimalConstants.sol";
13-
import {StringsUpgradeable as Strings} from "openzeppelin-contracts-upgradeable/contracts/utils/StringsUpgradeable.sol";
13+
import {Strings} from "openzeppelin-contracts/contracts/utils/Strings.sol";
1414

1515
/// @dev The default symbol for the reference asset.
1616
string constant DEFAULT_REFERENCE_ASSET_SYMBOL = "USD";

‎src/concrete/receipt/Receipt.sol‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ 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 {IERC20MetadataUpgradeable as IERC20Metadata} from
14-
"openzeppelin-contracts-upgradeable/contracts/token/ERC20/extensions/IERC20MetadataUpgradeable.sol";
15-
import {Base64Upgradeable as Base64} from "openzeppelin-contracts-upgradeable/contracts/utils/Base64Upgradeable.sol";
16-
import {StringsUpgradeable as Strings} from "openzeppelin-contracts-upgradeable/contracts/utils/StringsUpgradeable.sol";
13+
import {IERC20Metadata} from
14+
"openzeppelin-contracts/contracts/token/ERC20/extensions/IERC20Metadata.sol";
15+
import {Base64} from "openzeppelin-contracts/contracts/utils/Base64.sol";
16+
import {Strings} from "openzeppelin-contracts/contracts/utils/Strings.sol";
1717

1818
/// @dev The prefix for data URIs as base64 encoded JSON.
1919
string constant DATA_URI_BASE64_PREFIX = "data:application/json;base64,";

‎src/concrete/vault/OffchainAssetReceiptVault.sol‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ import {
1111
ICLONEABLE_V2_SUCCESS,
1212
ReceiptVaultConstructionConfigV2
1313
} from "../../abstract/ReceiptVault.sol";
14-
import {MathUpgradeable as Math} from "openzeppelin-contracts-upgradeable/contracts/utils/math/MathUpgradeable.sol";
14+
import {Math} from "openzeppelin-contracts/contracts/utils/math/Math.sol";
1515
import {IAuthorizeV1, Unauthorized} from "../../interface/IAuthorizeV1.sol";
16-
import {IERC165Upgradeable as IERC165} from
17-
"openzeppelin-contracts-upgradeable/contracts/utils/introspection/IERC165Upgradeable.sol";
16+
import {IERC165} from
17+
"openzeppelin-contracts/contracts/utils/introspection/IERC165.sol";
1818

1919
import {ZeroInitialAdmin} from "../authorize/OffchainAssetReceiptVaultAuthorizerV1.sol";
2020
import {OwnerFreezable} from "../../abstract/OwnerFreezable.sol";

‎src/interface/IOwnerFreezableV1.sol‎

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

5-
import {IERC5313Upgradeable as IERC5313} from
6-
"openzeppelin-contracts-upgradeable/contracts/interfaces/IERC5313Upgradeable.sol";
5+
import {IERC5313} from
6+
"openzeppelin-contracts/contracts/interfaces/IERC5313.sol";
77

88
/// @title IOwnerFreezableV1
99
/// @notice Interface for the OwnerFreezable contract.

‎src/interface/IReceiptV3.sol‎

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

5-
import {IERC1155Upgradeable as IERC1155} from
6-
"openzeppelin-contracts-upgradeable/contracts/token/ERC1155/IERC1155Upgradeable.sol";
5+
import {IERC1155} from
6+
"openzeppelin-contracts/contracts/token/ERC1155/IERC1155.sol";
77

88
/// @title IReceiptV3
99
/// @notice IReceiptV3 is an extension to IERC1155 that requires implementers to

‎src/interface/deprecated/IReceiptV1.sol‎

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

5-
import {IERC1155Upgradeable as IERC1155} from
6-
"openzeppelin-contracts-upgradeable/contracts/token/ERC1155/IERC1155Upgradeable.sol";
5+
import {IERC1155} from
6+
"openzeppelin-contracts/contracts/token/ERC1155/IERC1155.sol";
77

88
/// @title IReceiptV1
99
/// @notice IReceiptV1 is an extension to IERC1155 that requires implementers to

‎src/interface/deprecated/IReceiptV2.sol‎

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

5-
import {IERC1155Upgradeable as IERC1155} from
6-
"openzeppelin-contracts-upgradeable/contracts/token/ERC1155/IERC1155Upgradeable.sol";
5+
import {IERC1155} from
6+
"openzeppelin-contracts/contracts/token/ERC1155/IERC1155.sol";
77

88
/// @title IReceiptV2
99
/// @notice IReceiptV2 is an extension to IERC1155 that requires implementers to

0 commit comments

Comments
 (0)