OZ, Upgradeable & solidity 0.8.2

.gitignore

@@ -2,3 +2,4 @@ out/
 cache/
 .env
 .DS_Store
+**/artifacts/**

.gitmodules

@@ -1,9 +1,14 @@
 [submodule "lib/forge-std"]
 	path = lib/forge-std
 	url = https://github.com/foundry-rs/forge-std
-[submodule "lib/solmate"]
-	path = lib/solmate
-	url = https://github.com/transmissions11/solmate
-[submodule "lib/clones-with-immutable-args"]
-	path = lib/clones-with-immutable-args
-	url = https://github.com/wighawag/clones-with-immutable-args
+[submodule "lib/openzeppelin-contracts-upgradeable"]
+	path = lib/openzeppelin-contracts-upgradeable
+	url = https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable
+	branch=v4.9.6
+[submodule "lib/openzeppelin-contracts"]
+	path = lib/openzeppelin-contracts
+	url = https://github.com/OpenZeppelin/openzeppelin-contracts
+	branch=v4.9.6
+[submodule "lib/openzeppelin-foundry-upgrades"]
+	path = lib/openzeppelin-foundry-upgrades
+	url = https://github.com/OpenZeppelin/openzeppelin-foundry-upgrades

foundry.toml

@@ -2,9 +2,10 @@
 verbosity = 0
 optimizer = true     # enable or disable the solc optimizer
 optimizer_runs = 100000 # the number of optimizer runs
-solc_version = '0.8.15'
+solc_version = '0.8.20'
 remappings = [
-    'solmate/=lib/solmate/src/',
-    'clones/=lib/clones-with-immutable-args/src/',
+    'ds-test/=lib/forge-std/lib/ds-test/src/',
     'forge-std/=lib/forge-std/src/',
+    '@openzeppelin/contracts/=lib/openzeppelin-contracts/contracts/',
+    '@openzeppelin/contracts-upgradeable/=lib/openzeppelin-contracts-upgradeable/contracts/'
 ]

src/BondAggregator.sol

@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: AGPL-3.0-or-later
-pragma solidity 0.8.15;
-
-import {ERC20} from "solmate/src/tokens/ERC20.sol";
-import {Auth, Authority} from "solmate/src/auth/Auth.sol";
+pragma solidity 0.8.20;
 
+import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";
+import {Auth} from "./lib/Auth.sol";
+import {IAuthority} from "./interfaces/IAuthority.sol";
 import {IBondAggregator} from "./interfaces/IBondAggregator.sol";
 import {IBondTeller} from "./interfaces/IBondTeller.sol";
 import {IBondAuctioneer} from "./interfaces/IBondAuctioneer.sol";
@@ -56,7 +56,7 @@ contract BondAggregator is IBondAggregator, Auth {
     // A 'vesting' param longer than 50 years is considered a timestamp for fixed expiry.
     uint48 private constant MAX_FIXED_TERM = 52 weeks * 50;
 
-    constructor(address guardian_, Authority authority_) Auth(guardian_, authority_) {}
+    constructor(address guardian_, IAuthority authority_) Auth(guardian_, authority_) {}
 
     /// @inheritdoc IBondAggregator
     function registerAuctioneer(IBondAuctioneer auctioneer_) external requiresAuth {

src/BondFixedExpiryFPA.sol

@@ -1,9 +1,10 @@
 // SPDX-License-Identifier: AGPL-3.0-or-later
-pragma solidity 0.8.15;
+pragma solidity 0.8.20;
 
-import {ERC20} from "solmate/src/tokens/ERC20.sol";
-import {BondBaseFPA, IBondAggregator, Authority} from "./bases/BondBaseFPA.sol";
+import {IAuthority} from "./interfaces/IAuthority.sol";
+import {IBondAggregator} from "./interfaces/IBondAggregator.sol";
 import {IBondTeller} from "./interfaces/IBondTeller.sol";
+import {BondBaseFPA} from "./bases/BondBaseFPA.sol";
 
 /// @title Bond Fixed-Expiry Fixed Price Auctioneer
 /// @notice Bond Fixed-Expiry Fixed Price Auctioneer Contract
@@ -33,7 +34,7 @@ contract BondFixedExpiryFPA is BondBaseFPA {
         IBondTeller teller_,
         IBondAggregator aggregator_,
         address guardian_,
-        Authority authority_
+        IAuthority authority_
     ) BondBaseFPA(teller_, aggregator_, guardian_, authority_) {}
 
     /// @inheritdoc BondBaseFPA

src/BondFixedExpiryOFDA.sol

@@ -1,8 +1,10 @@
 // SPDX-License-Identifier: AGPL-3.0-or-later
-pragma solidity 0.8.15;
+pragma solidity 0.8.20;
 
-import {BondBaseOFDA, IBondAggregator, Authority} from "./bases/BondBaseOFDA.sol";
+import {IAuthority} from "./interfaces/IAuthority.sol";
+import {IBondAggregator} from "./interfaces/IBondAggregator.sol";
 import {IBondTeller} from "./interfaces/IBondTeller.sol";
+import {BondBaseOFDA} from "./bases/BondBaseOFDA.sol";
 
 /// @title Bond Fixed-Expiry Fixed Discount Auctioneer
 /// @notice Bond Fixed-Expiry Fixed Discount Auctioneer Contract
@@ -33,7 +35,7 @@ contract BondFixedExpiryOFDA is BondBaseOFDA {
         IBondTeller teller_,
         IBondAggregator aggregator_,
         address guardian_,
-        Authority authority_
+        IAuthority authority_
     ) BondBaseOFDA(teller_, aggregator_, guardian_, authority_) {}
 
     /// @inheritdoc BondBaseOFDA

src/BondFixedExpiryOSDA.sol

@@ -1,8 +1,10 @@
 // SPDX-License-Identifier: AGPL-3.0-or-later
 pragma solidity ^0.8.15;
 
-import {BondBaseOSDA, IBondAggregator, Authority} from "./bases/BondBaseOSDA.sol";
+import {IAuthority} from "./interfaces/IAuthority.sol";
+import {IBondAggregator} from "./interfaces/IBondAggregator.sol";
 import {IBondTeller} from "./interfaces/IBondTeller.sol";
+import {BondBaseOSDA} from "./bases/BondBaseOSDA.sol";
 
 /// @title Bond Fixed-Expiry Oracle-based Sequential Dutch Auctioneer
 /// @notice Bond Fixed-Expiry Oracle-based Sequential Dutch Auctioneer Contract
@@ -25,7 +27,7 @@ contract BondFixedExpiryOSDA is BondBaseOSDA {
         IBondTeller teller_,
         IBondAggregator aggregator_,
         address guardian_,
-        Authority authority_
+        IAuthority authority_
     ) BondBaseOSDA(teller_, aggregator_, guardian_, authority_) {}
 
     /// @inheritdoc BondBaseOSDA

src/BondFixedExpirySDA.sol

@@ -1,8 +1,10 @@
 // SPDX-License-Identifier: AGPL-3.0-or-later
-pragma solidity 0.8.15;
+pragma solidity 0.8.20;
 
-import {BondBaseSDA, IBondAggregator, Authority} from "./bases/BondBaseSDA.sol";
+import {IAuthority} from "./interfaces/IAuthority.sol";
+import {IBondAggregator} from "./interfaces/IBondAggregator.sol";
 import {IBondTeller} from "./interfaces/IBondTeller.sol";
+import {BondBaseSDA} from "./bases/BondBaseSDA.sol";
 
 /// @title Bond Fixed-Expiry Sequential Dutch Auctioneer v1.1
 /// @notice Bond Fixed-Expiry Sequential Dutch Auctioneer Contract
@@ -25,7 +27,7 @@ contract BondFixedExpirySDA is BondBaseSDA {
         IBondTeller teller_,
         IBondAggregator aggregator_,
         address guardian_,
-        Authority authority_
+        IAuthority authority_
     ) BondBaseSDA(teller_, aggregator_, guardian_, authority_) {}
 
     /// @inheritdoc BondBaseSDA

src/BondFixedExpiryTeller.sol

@@ -1,12 +1,13 @@
 // SPDX-License-Identifier: AGPL-3.0-or-later
-pragma solidity 0.8.15;
+pragma solidity 0.8.20;
 
-import {ERC20} from "solmate/src/tokens/ERC20.sol";
-import {ClonesWithImmutableArgs} from "clones-with-immutable-args/ClonesWithImmutableArgs.sol";
-
-import {BondBaseTeller, IBondAggregator, Authority} from "./bases/BondBaseTeller.sol";
+import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";
+import {SafeERC20} from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
+import {IAuthority} from "./interfaces/IAuthority.sol";
+import {IBondAggregator} from "./interfaces/IBondAggregator.sol";
+import {BondBaseTeller} from "./bases/BondBaseTeller.sol";
 import {FullMath} from "./lib/FullMath.sol";
-import "./bases/BondTeller1155.sol";
+import {BondTeller1155Upgradeable} from "./bases/BondTeller1155Upgradeable.sol";
 
 /// @title Bond Fixed Expiry Teller
 /// @notice Bond Fixed Expiry Teller Contract
@@ -24,17 +25,42 @@ import "./bases/BondTeller1155.sol";
 ///      duplicate tokens with the same name/symbol.
 ///
 /// @author Oighty, Zeus, Potted Meat, indigo
-contract BondFixedExpiryTeller is BondTeller1155 {
-    using TransferHelper for ERC20;
+contract BondFixedExpiryTeller is BondTeller1155Upgradeable {
+    using SafeERC20 for ERC20;
 
     /* ========== CONSTRUCTOR ========== */
-    constructor(
+    /// @custom:oz-upgrades-unsafe-allow constructor
+    constructor() {
+        _disableInitializers();
+    }
+
+    function initialize(
         address protocol_,
         IBondAggregator aggregator_,
         address guardian_,
-        Authority authority_
-    ) BondTeller1155(protocol_, aggregator_, guardian_, authority_) {}
+        IAuthority authority_
+    ) public initializer {
+        __BondFixedExpiryTeller_init(
+            protocol_,
+            aggregator_,
+            guardian_,
+            authority_
+        );
+    }
 
+    function __BondFixedExpiryTeller_init(
+        address protocol_,
+        IBondAggregator aggregator_,
+        address guardian_,
+        IAuthority authority_
+    ) public onlyInitializing {
+        __BondTeller1155_init(
+            protocol_, 
+            aggregator_,
+            guardian_, 
+            authority_
+        );
+    }
     /* ========== PURCHASE ========== */
 
     /// @notice             Handle payout to recipient
@@ -77,7 +103,7 @@ contract BondFixedExpiryTeller is BondTeller1155 {
         } else {
             // If no expiry, then transfer payout directly to user
             if (address(payoutToken_) == address(0)) {
-                bool sent = payable(recipient_).send(payout_);
+                (bool sent,) = payable(address(recipient_)).call{value: payout_}("");
                 require(sent, "Failed to send native tokens");
             } else {
                 payoutToken_.safeTransfer(recipient_, payout_);

src/BondFixedTermFPA.sol

@@ -1,8 +1,10 @@
 // SPDX-License-Identifier: AGPL-3.0-or-later
-pragma solidity 0.8.15;
+pragma solidity 0.8.20;
 
-import {BondBaseFPA, IBondAggregator, Authority} from "./bases/BondBaseFPA.sol";
+import {IAuthority} from "./interfaces/IAuthority.sol";
+import {IBondAggregator} from "./interfaces/IBondAggregator.sol";
 import {IBondTeller} from "./interfaces/IBondTeller.sol";
+import {BondBaseFPA} from "./bases/BondBaseFPA.sol";
 
 /// @title Bond Fixed-Term Fixed Price Auctioneer
 /// @notice Bond Fixed-Term Fixed Price Auctioneer Contract
@@ -32,8 +34,8 @@ contract BondFixedTermFPA is BondBaseFPA {
         IBondTeller teller_,
         IBondAggregator aggregator_,
         address guardian_,
-        Authority authority_
-    ) BondBaseFPA(teller_, aggregator_, guardian_, authority_) {}
+        IAuthority authority_
+    ) BondBaseFPA(teller_, aggregator_,guardian_, authority_) {}
 
     /* ========== MARKET FUNCTIONS ========== */
     /// @inheritdoc BondBaseFPA

src/BondFixedTermOFDA.sol

@@ -1,8 +1,10 @@
 // SPDX-License-Identifier: AGPL-3.0-or-later
-pragma solidity 0.8.15;
+pragma solidity 0.8.20;
 
-import {BondBaseOFDA, IBondAggregator, Authority} from "./bases/BondBaseOFDA.sol";
+import {IAuthority} from "./interfaces/IAuthority.sol";
+import {IBondAggregator} from "./interfaces/IBondAggregator.sol";
 import {IBondTeller} from "./interfaces/IBondTeller.sol";
+import {BondBaseOFDA} from "./bases/BondBaseOFDA.sol";
 
 /// @title Bond Fixed-Term Fixed Discount Auctioneer
 /// @notice Bond Fixed-Term Fixed Discount Auctioneer Contract
@@ -33,7 +35,7 @@ contract BondFixedTermOFDA is BondBaseOFDA {
         IBondTeller teller_,
         IBondAggregator aggregator_,
         address guardian_,
-        Authority authority_
+        IAuthority authority_
     ) BondBaseOFDA(teller_, aggregator_, guardian_, authority_) {}
 
     /* ========== MARKET FUNCTIONS ========== */

src/BondFixedTermOSDA.sol

@@ -1,8 +1,10 @@
 // SPDX-License-Identifier: AGPL-3.0-or-later
-pragma solidity ^0.8.15;
+pragma solidity 0.8.20;
 
-import {BondBaseOSDA, IBondAggregator, Authority} from "./bases/BondBaseOSDA.sol";
+import {IAuthority} from "./interfaces/IAuthority.sol";
+import {IBondAggregator} from "./interfaces/IBondAggregator.sol";
 import {IBondTeller} from "./interfaces/IBondTeller.sol";
+import {BondBaseOSDA} from "./bases/BondBaseOSDA.sol";
 
 /// @title Bond Fixed-Term Oracle-based Sequential Dutch Auctioneer
 /// @notice Bond Fixed-Term Oracle-based Sequential Dutch Auctioneer Contract
@@ -25,7 +27,7 @@ contract BondFixedTermOSDA is BondBaseOSDA {
         IBondTeller teller_,
         IBondAggregator aggregator_,
         address guardian_,
-        Authority authority_
+        IAuthority authority_
     ) BondBaseOSDA(teller_, aggregator_, guardian_, authority_) {}
 
     /* ========== MARKET FUNCTIONS ========== */

src/BondFixedTermSDA.sol

@@ -1,8 +1,10 @@
 // SPDX-License-Identifier: AGPL-3.0-or-later
-pragma solidity 0.8.15;
+pragma solidity 0.8.20;
 
-import {BondBaseSDA, IBondAggregator, Authority} from "./bases/BondBaseSDA.sol";
+import {IAuthority} from "./interfaces/IAuthority.sol";
+import {IBondAggregator} from "./interfaces/IBondAggregator.sol";
 import {IBondTeller} from "./interfaces/IBondTeller.sol";
+import {BondBaseSDA} from "./bases/BondBaseSDA.sol";
 
 /// @title Bond Fixed-Term Sequential Dutch Auctioneer
 /// @notice Bond Fixed-Term Sequential Dutch Auctioneer Contract
@@ -25,7 +27,7 @@ contract BondFixedTermSDA is BondBaseSDA {
         IBondTeller teller_,
         IBondAggregator aggregator_,
         address guardian_,
-        Authority authority_
+        IAuthority authority_
     ) BondBaseSDA(teller_, aggregator_, guardian_, authority_) {}
 
     /* ========== MARKET FUNCTIONS ========== */