From 69e95d8e7ae6192968ace0e5325a0ecf02418e1b Mon Sep 17 00:00:00 2001 From: Marco Peyfuss Date: Tue, 9 Jan 2024 13:46:54 -0700 Subject: [PATCH] using some relatively imports to get around verification conflicts for etherscan in inheriting repos --- src/payments/RoyaltyPayoutHelper.sol | 4 ++-- src/payments/SanctionsCompliance.sol | 2 +- src/payments/TransferHelper.sol | 2 +- src/royalties/EIP2981TL.sol | 2 +- src/upgradeable/payments/RoyaltyPayoutHelperUpgradeable.sol | 4 ++-- src/upgradeable/payments/SanctionsComplianceUpgradeable.sol | 2 +- src/upgradeable/royalties/EIP2981TLUpgradeable.sol | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/payments/RoyaltyPayoutHelper.sol b/src/payments/RoyaltyPayoutHelper.sol index e7a7638..b8bb712 100644 --- a/src/payments/RoyaltyPayoutHelper.sol +++ b/src/payments/RoyaltyPayoutHelper.sol @@ -2,8 +2,8 @@ pragma solidity ^0.8.20; import {IRoyaltyEngineV1} from "royalty-registry-solidity/IRoyaltyEngineV1.sol"; -import {SanctionsCompliance} from "src/payments/SanctionsCompliance.sol"; -import {TransferHelper} from "src/payments/TransferHelper.sol"; +import {SanctionsCompliance} from "./SanctionsCompliance.sol"; +import {TransferHelper} from "./TransferHelper.sol"; /// @title Royalty Payout Helper /// @notice Abstract contract to help payout royalties using the Royalty Registry diff --git a/src/payments/SanctionsCompliance.sol b/src/payments/SanctionsCompliance.sol index a456fc7..cb57d9d 100644 --- a/src/payments/SanctionsCompliance.sol +++ b/src/payments/SanctionsCompliance.sol @@ -1,7 +1,7 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.20; -import {IChainalysisSanctionsOracle} from "src/payments/IChainalysisSanctionsOracle.sol"; +import {IChainalysisSanctionsOracle} from "./IChainalysisSanctionsOracle.sol"; /// @title Sanctions Compliance /// @notice Abstract contract to comply with U.S. sanctioned addresses diff --git a/src/payments/TransferHelper.sol b/src/payments/TransferHelper.sol index 9a48f16..99d50a7 100644 --- a/src/payments/TransferHelper.sol +++ b/src/payments/TransferHelper.sol @@ -2,7 +2,7 @@ pragma solidity ^0.8.20; import {SafeERC20} from "openzeppelin/token/ERC20/utils/SafeERC20.sol"; -import {IWETH, IERC20} from "src/payments/IWETH.sol"; +import {IWETH, IERC20} from "./IWETH.sol"; /// @title Transfer Helper /// @notice Abstract contract that has helper function for sending ETH and ERC20's safely diff --git a/src/royalties/EIP2981TL.sol b/src/royalties/EIP2981TL.sol index 6272197..dcabaaf 100644 --- a/src/royalties/EIP2981TL.sol +++ b/src/royalties/EIP2981TL.sol @@ -2,7 +2,7 @@ pragma solidity ^0.8.20; import {ERC165} from "openzeppelin/utils/introspection/ERC165.sol"; -import {IEIP2981} from "src/royalties/IEIP2981.sol"; +import {IEIP2981} from "./IEIP2981.sol"; /// @title EIP2981TL.sol /// @notice Abstract contract to define a default royalty spec diff --git a/src/upgradeable/payments/RoyaltyPayoutHelperUpgradeable.sol b/src/upgradeable/payments/RoyaltyPayoutHelperUpgradeable.sol index 451fca0..945dbaf 100644 --- a/src/upgradeable/payments/RoyaltyPayoutHelperUpgradeable.sol +++ b/src/upgradeable/payments/RoyaltyPayoutHelperUpgradeable.sol @@ -2,8 +2,8 @@ pragma solidity ^0.8.20; import {IRoyaltyEngineV1} from "royalty-registry-solidity/IRoyaltyEngineV1.sol"; -import {TransferHelper} from "src/payments/TransferHelper.sol"; -import {SanctionsComplianceUpgradeable} from "src/upgradeable/payments/SanctionsComplianceUpgradeable.sol"; +import {TransferHelper} from "../../payments/TransferHelper.sol"; +import {SanctionsComplianceUpgradeable} from "../../upgradeable/payments/SanctionsComplianceUpgradeable.sol"; /// @title Royalty Payout Helper /// @notice Abstract contract to help payout royalties using the Royalty Registry diff --git a/src/upgradeable/payments/SanctionsComplianceUpgradeable.sol b/src/upgradeable/payments/SanctionsComplianceUpgradeable.sol index 9084570..1daa585 100644 --- a/src/upgradeable/payments/SanctionsComplianceUpgradeable.sol +++ b/src/upgradeable/payments/SanctionsComplianceUpgradeable.sol @@ -2,7 +2,7 @@ pragma solidity ^0.8.17; import {Initializable} from "openzeppelin-upgradeable/proxy/utils/Initializable.sol"; -import {IChainalysisSanctionsOracle} from "src/payments/IChainalysisSanctionsOracle.sol"; +import {IChainalysisSanctionsOracle} from "../../payments/IChainalysisSanctionsOracle.sol"; /// @title Sanctions Compliance /// @notice Abstract contract to comply with U.S. sanctioned addresses diff --git a/src/upgradeable/royalties/EIP2981TLUpgradeable.sol b/src/upgradeable/royalties/EIP2981TLUpgradeable.sol index 47df0a6..876262f 100644 --- a/src/upgradeable/royalties/EIP2981TLUpgradeable.sol +++ b/src/upgradeable/royalties/EIP2981TLUpgradeable.sol @@ -2,7 +2,7 @@ pragma solidity ^0.8.20; import {ERC165Upgradeable} from "openzeppelin-upgradeable/utils/introspection/ERC165Upgradeable.sol"; -import {IEIP2981} from "src/royalties/IEIP2981.sol"; +import {IEIP2981} from "../../royalties/IEIP2981.sol"; /// @title EIP2981TLUpgradeable.sol /// @notice Abstract contract to define a default royalty spec