Add missing import and rename module

divergencetech · Jul 14, 2022 · 0bf8b3c · 0bf8b3c
1 parent c824d60
commit 0bf8b3c
Show file tree

Hide file tree

Showing 7 changed files with 50 additions and 20 deletions.
diff --git a/contracts/sales/presets/ArbitraryPriceRefundSeller.sol b/contracts/sales/presets/ArbitraryPriceRefundSeller.sol
@@ -2,13 +2,13 @@
 // Copyright (c) 2021 the ethier authors (github.com/divergencetech/ethier)
 pragma solidity >=0.8.0 <0.9.0;
 
-import "../sellers/FixedSupplyRefund.sol";
+import "../sellers/FixedSupplyTxLimitRefund.sol";
 import "../sellers/FixedPrice.sol";
 import "../sellers/SellableCallbacker.sol";
 import "../../utils/OwnerPausable.sol";
 
 abstract contract ArbitraryPriceRefundSeller is
-    FixedSupplyRefund,
+    FixedSupplyTxLimitRefund,
     SellableCallbacker,
     OwnerPausable
 {
@@ -19,7 +19,11 @@ abstract contract ArbitraryPriceRefundSeller is
     }
 
     constructor(Config memory cfg, ISellable sellable)
-        FixedSupplyRefund(cfg.totalInventory, cfg.maxPerTx, cfg.maxPerAddress)
+        FixedSupplyTxLimitRefund(
+            cfg.totalInventory,
+            cfg.maxPerTx,
+            cfg.maxPerAddress
+        )
         SellableCallbacker(sellable)
     {} // solhint-disable-line no-empty-blocks
 
@@ -43,14 +47,18 @@ abstract contract ArbitraryPriceRefundSeller is
     )
         internal
         virtual
-        override(FixedSupplyRefund)
+        override(FixedSupplyTxLimitRefund)
         returns (
             address,
             uint64,
             uint256
         )
     {
-        (to, num, cost) = FixedSupplyRefund._beforePurchase(to, num, cost);
+        (to, num, cost) = FixedSupplyTxLimitRefund._beforePurchase(
+            to,
+            num,
+            cost
+        );
         return (to, num, cost);
     }
 }
diff --git a/contracts/sales/presets/FixedPriceRefundSeller.sol b/contracts/sales/presets/FixedPriceRefundSeller.sol
@@ -2,13 +2,13 @@
 // Copyright (c) 2021 the ethier authors (github.com/divergencetech/ethier)
 pragma solidity >=0.8.0 <0.9.0;
 
-import "../sellers/FixedSupplyRefund.sol";
+import "../sellers/FixedSupplyTxLimitRefund.sol";
 import "../sellers/FixedPrice.sol";
 import "../sellers/SellableCallbacker.sol";
 import "../../utils/OwnerPausable.sol";
 
 contract FixedPriceRefundSeller is
-    FixedSupplyRefund,
+    FixedSupplyTxLimitRefund,
     FixedPrice,
     SellableCallbacker,
     OwnerPausable
@@ -21,7 +21,11 @@ contract FixedPriceRefundSeller is
     }
 
     constructor(Config memory cfg, ISellable sellable)
-        FixedSupplyRefund(cfg.totalInventory, cfg.maxPerTx, cfg.maxPerAddress)
+        FixedSupplyTxLimitRefund(
+            cfg.totalInventory,
+            cfg.maxPerTx,
+            cfg.maxPerAddress
+        )
         FixedPrice(cfg.price)
         SellableCallbacker(sellable)
     {} // solhint-disable-line no-empty-blocks
@@ -39,22 +43,26 @@ contract FixedPriceRefundSeller is
     )
         internal
         virtual
-        override(FixedSupplyRefund, InternalCostSeller)
+        override(FixedSupplyTxLimitRefund, InternalCostSeller)
         returns (
             address,
             uint64,
             uint256
         )
     {
-        (to, num, cost) = FixedSupplyRefund._beforePurchase(to, num, cost);
+        (to, num, cost) = FixedSupplyTxLimitRefund._beforePurchase(
+            to,
+            num,
+            cost
+        );
         return (to, num, cost);
     }
 
     function _afterPurchase(
         address to,
         uint64 num,
         uint256 cost
-    ) internal virtual override(FixedSupplyRefund, Seller) {
+    ) internal virtual override(FixedSupplyTxLimitRefund, Seller) {
         CappedRefund._afterPurchase(to, num, cost);
     }
 

diff --git a/contracts/sales/presets/FreeOwnerAirdropper.sol b/contracts/sales/presets/FreeOwnerAirdropper.sol
@@ -2,7 +2,7 @@
 // Copyright (c) 2021 the ethier authors (github.com/divergencetech/ethier)
 pragma solidity >=0.8.0 <0.9.0;
 
-import "../sellers/FixedSupplyRefund.sol";
+import "../sellers/FixedSupplyTxLimitRefund.sol";
 import "../sellers/FixedPrice.sol";
 import "../sellers/SellableCallbacker.sol";
 import "../../utils/OwnerPausable.sol";

diff --git a/contracts/sales/presets/LinearDutchAuctionRefundSeller.sol b/contracts/sales/presets/LinearDutchAuctionRefundSeller.sol
@@ -2,13 +2,13 @@
 // Copyright (c) 2021 the ethier authors (github.com/divergencetech/ethier)
 pragma solidity >=0.8.0 <0.9.0;
 
-import "../sellers/FixedSupplyRefund.sol";
+import "../sellers/FixedSupplyTxLimitRefund.sol";
 import "../sellers/LinearDutchAuction.sol";
 import "../sellers/SellableCallbacker.sol";
 import "../../utils/OwnerPausable.sol";
 
 contract LinearDutchAuctionRefundSeller is
-    FixedSupplyRefund,
+    FixedSupplyTxLimitRefund,
     LinearDutchAuction,
     SellableCallbacker,
     OwnerPausable
@@ -25,7 +25,11 @@ contract LinearDutchAuctionRefundSeller is
         uint256 expectedReserve,
         ISellable sellable
     )
-        FixedSupplyRefund(cfg.totalInventory, cfg.maxPerTx, cfg.maxPerAddress)
+        FixedSupplyTxLimitRefund(
+            cfg.totalInventory,
+            cfg.maxPerTx,
+            cfg.maxPerAddress
+        )
         LinearDutchAuction(config, expectedReserve)
         SellableCallbacker(sellable)
     {} // solhint-disable-line no-empty-blocks
@@ -53,14 +57,18 @@ contract LinearDutchAuctionRefundSeller is
     )
         internal
         virtual
-        override(FixedSupplyRefund, InternalCostSeller)
+        override(FixedSupplyTxLimitRefund, InternalCostSeller)
         returns (
             address,
             uint64,
             uint256
         )
     {
-        (to, num, cost) = FixedSupplyRefund._beforePurchase(to, num, cost);
+        (to, num, cost) = FixedSupplyTxLimitRefund._beforePurchase(
+            to,
+            num,
+            cost
+        );
         (to, num, cost) = InternalCostSeller._beforePurchase(to, num, cost);
         return (to, num, cost);
     }
@@ -69,8 +77,8 @@ contract LinearDutchAuctionRefundSeller is
         address to,
         uint64 num,
         uint256 cost
-    ) internal virtual override(FixedSupplyRefund, Seller) {
-        FixedSupplyRefund._afterPurchase(to, num, cost);
+    ) internal virtual override(FixedSupplyTxLimitRefund, Seller) {
+        FixedSupplyTxLimitRefund._afterPurchase(to, num, cost);
     }
 
     function purchase(address to, uint64 num) external payable whenNotPaused {

diff --git a/contracts/sales/sellers/CappedRefund.sol b/contracts/sales/sellers/CappedRefund.sol
@@ -3,6 +3,7 @@
 pragma solidity >=0.8.0 <0.9.0;
 
 import "@openzeppelin/contracts/utils/math/Math.sol";
+import "@openzeppelin/contracts/utils/Context.sol";
 import "./Seller.sol";
 
 /// @notice Abstract seller module that modifies the requested number of tokens

diff --git a/...racts/sales/sellers/FixedSupplyRefund.sol → ...ales/sellers/FixedSupplyTxLimitRefund.sol b/...racts/sales/sellers/FixedSupplyRefund.sol → ...ales/sellers/FixedSupplyTxLimitRefund.sol
@@ -11,7 +11,11 @@ import "./TxLimit.sol";
 /// @notice This composes the functionality of three modules providing a
 /// capping of the requested number of items base on a total supply and limits
 /// per transaction and purchaser.
-abstract contract FixedSupplyRefund is FixedSupply, TxLimit, CappedRefund {
+abstract contract FixedSupplyTxLimitRefund is
+    FixedSupply,
+    TxLimit,
+    CappedRefund
+{
     constructor(
         uint64 totalInventory_,
         uint64 maxPerTx_,

diff --git a/contracts/sales/sellers/LinearDutchAuction.sol b/contracts/sales/sellers/LinearDutchAuction.sol
@@ -3,6 +3,7 @@
 pragma solidity >=0.8.0 <0.9.0;
 
 import "./Seller.sol";
+import "./InternalCostSeller.sol";
 import "@openzeppelin/contracts/utils/math/Math.sol";
 
 /**