Skip to content

Commit be8ad8b

Browse files
thedavidmeisterthedavidmeister
committed
wip on compile
1 parent 2592bbe commit be8ad8b

20 files changed

+39
-39
lines changed

‎foundry.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ optimizer_runs = 100000
99
evm_version = "cancun"
1010

1111
remappings = [
12-
"openzeppelin-contracts/=lib/openzeppelin-contracts/contracts/",
13-
"openzeppelin-contracts-upgradeable/=lib/openzeppelin-contracts-upgradeable/contracts/",
12+
"openzeppelin-contracts/=lib/openzeppelin-contracts/",
13+
"openzeppelin-contracts-upgradeable/=lib/openzeppelin-contracts-upgradeable/",
1414
"rain.factory/=lib/rain.factory/src/",
1515
"rain.intorastring/=lib/rain.interpreter/lib/rain.intorastring/src/",
1616
"rain.flare/=lib/rain.flare/src/",

‎src/abstract/OwnerFreezable.sol‎

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

5-
import {OwnableUpgradeable as Ownable} from "openzeppelin-contracts-upgradeable/contracts/access/OwnableUpgradeable.sol";
5+
import {OwnableUpgradeable as Ownable} from "openzeppelin-contracts-upgradeable/access/OwnableUpgradeable.sol";
66
import {IOwnerFreezableV1, IERC5313} from "../interface/IOwnerFreezableV1.sol";
77

88
/// @title OwnerFreezable

‎src/abstract/PriceOracleV2.sol‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
pragma solidity =0.8.25;
44

55
import {IPriceOracleV2} from "../interface/IPriceOracleV2.sol";
6-
import {Address} from "openzeppelin-contracts/contracts/utils/Address.sol";
6+
import {Address} from "openzeppelin-contracts/utils/Address.sol";
77

88
abstract contract PriceOracleV2 is IPriceOracleV2 {
99
/// Hook for implementing contracts to define their own price logic.

‎src/abstract/ReceiptVault.sol‎

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

5-
import {ERC20Upgradeable as ERC20} from "openzeppelin-contracts-upgradeable/contracts/token/ERC20/ERC20Upgradeable.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";
5+
import {ERC20Upgradeable as ERC20} from "openzeppelin-contracts-upgradeable/token/ERC20/ERC20Upgradeable.sol";
6+
import {ReentrancyGuard} from "openzeppelin-contracts/utils/ReentrancyGuard.sol";
7+
import {IERC20} from "openzeppelin-contracts/token/ERC20/IERC20.sol";
8+
import {SafeERC20} from "openzeppelin-contracts/token/ERC20/utils/SafeERC20.sol";
99
import {MulticallUpgradeable as Multicall} from
10-
"openzeppelin-contracts-upgradeable/contracts/utils/MulticallUpgradeable.sol";
10+
"openzeppelin-contracts-upgradeable/utils/MulticallUpgradeable.sol";
1111
import {IReceiptVaultV3, IReceiptVaultV1, IReceiptV3} from "../interface/IReceiptVaultV3.sol";
1212
import {IReceiptManagerV2} from "../interface/IReceiptManagerV2.sol";
1313
import {
@@ -17,7 +17,7 @@ import {
1717
import {ICloneableFactoryV2} from "rain.factory/interface/ICloneableFactoryV2.sol";
1818
//forge-lint: disable-next-line(unused-import)
1919
import {ICloneableV2, ICLONEABLE_V2_SUCCESS} from "rain.factory/interface/ICloneableV2.sol";
20-
import {Address} from "openzeppelin-contracts/contracts/utils/Address.sol";
20+
import {Address} from "openzeppelin-contracts/utils/Address.sol";
2121
import {
2222
InvalidId,
2323
ZeroReceiver,
@@ -29,8 +29,8 @@ import {
2929
} from "../error/ErrReceiptVault.sol";
3030
import {UnmanagedReceiptTransfer} from "../interface/IReceiptManagerV2.sol";
3131
import {ERC165Upgradeable as ERC165} from
32-
"openzeppelin-contracts-upgradeable/contracts/utils/introspection/ERC165Upgradeable.sol";
33-
import {IERC20Metadata} from "openzeppelin-contracts/contracts/token/ERC20/extensions/IERC20Metadata.sol";
32+
"openzeppelin-contracts-upgradeable/utils/introspection/ERC165Upgradeable.sol";
33+
import {IERC20Metadata} from "openzeppelin-contracts/token/ERC20/extensions/IERC20Metadata.sol";
3434

3535
/// Represents the action being taken on shares, ostensibly for calculating a
3636
/// ratio.

‎src/concrete/authorize/OffchainAssetReceiptVaultAuthorizerV1.sol‎

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

77
import {AccessControlUpgradeable as AccessControl} from
8-
"openzeppelin-contracts-upgradeable/contracts/access/AccessControlUpgradeable.sol";
9-
import {IAccessControl} from "openzeppelin-contracts/contracts/access/IAccessControl.sol";
8+
"openzeppelin-contracts-upgradeable/access/AccessControlUpgradeable.sol";
9+
import {IAccessControl} from "openzeppelin-contracts/access/IAccessControl.sol";
1010
import {ICloneableV2, ICLONEABLE_V2_SUCCESS} from "rain.factory/interface/ICloneableV2.sol";
1111
import {
1212
CONFISCATE_RECEIPT,
@@ -19,7 +19,7 @@ import {
1919
TransferSharesStateChange,
2020
TransferReceiptStateChange
2121
} from "../vault/OffchainAssetReceiptVault.sol";
22-
import {IERC165} from "openzeppelin-contracts/contracts/utils/introspection/IERC165.sol";
22+
import {IERC165} from "openzeppelin-contracts/utils/introspection/IERC165.sol";
2323

2424
/// Thrown when the admin is address zero.
2525
error ZeroInitialAdmin();

‎src/concrete/authorize/OffchainAssetReceiptVaultPaymentMintAuthorizerV1.sol‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +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 "openzeppelin-contracts/contracts/token/ERC20/utils/SafeERC20.sol";
9-
import {IERC20} from "openzeppelin-contracts/contracts/token/ERC20/IERC20.sol";
8+
import {SafeERC20} from "openzeppelin-contracts/token/ERC20/utils/SafeERC20.sol";
9+
import {IERC20} from "openzeppelin-contracts/token/ERC20/IERC20.sol";
1010
import {DEPOSIT, DepositStateChange} from "../vault/OffchainAssetReceiptVault.sol";
11-
import {OwnableUpgradeable as Ownable} from "openzeppelin-contracts-upgradeable/contracts/access/OwnableUpgradeable.sol";
12-
import {IERC20Metadata} from "openzeppelin-contracts/contracts/token/ERC20/extensions/IERC20Metadata.sol";
11+
import {OwnableUpgradeable as Ownable} from "openzeppelin-contracts-upgradeable/access/OwnableUpgradeable.sol";
12+
import {IERC20Metadata} from "openzeppelin-contracts/token/ERC20/extensions/IERC20Metadata.sol";
1313
import {
1414
OffchainAssetReceiptVaultAuthorizerV1,
1515
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 {Strings} from "openzeppelin-contracts/contracts/utils/Strings.sol";
13+
import {Strings} from "openzeppelin-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
@@ -9,10 +9,10 @@ import {IReceiptV3} from "../../interface/IReceiptV3.sol";
99
import {IReceiptVaultV3} from "../../interface/IReceiptVaultV3.sol";
1010
import {OnlyManager} from "../../error/ErrReceipt.sol";
1111
import {ERC1155Upgradeable as ERC1155} from
12-
"openzeppelin-contracts-upgradeable/contracts/token/ERC1155/ERC1155Upgradeable.sol";
13-
import {IERC20Metadata} from "openzeppelin-contracts/contracts/token/ERC20/extensions/IERC20Metadata.sol";
14-
import {Base64} from "openzeppelin-contracts/contracts/utils/Base64.sol";
15-
import {Strings} from "openzeppelin-contracts/contracts/utils/Strings.sol";
12+
"openzeppelin-contracts-upgradeable/token/ERC1155/ERC1155Upgradeable.sol";
13+
import {IERC20Metadata} from "openzeppelin-contracts/token/ERC20/extensions/IERC20Metadata.sol";
14+
import {Base64} from "openzeppelin-contracts/utils/Base64.sol";
15+
import {Strings} from "openzeppelin-contracts/utils/Strings.sol";
1616

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

‎src/concrete/vault/OffchainAssetReceiptVault.sol‎

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

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

‎src/interface/IOwnerFreezableV1.sol‎

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

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

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

0 commit comments

Comments
 (0)