diff --git a/src/pricing/BaseRecallPricing.sol b/src/pricing/BaseRecallPricing.sol deleted file mode 100644 index 39c1ee4..0000000 --- a/src/pricing/BaseRecallPricing.sol +++ /dev/null @@ -1,50 +0,0 @@ -// SPDX-License-Identifier: Apache-2.0 -// █████╗ ███████╗████████╗ █████╗ ██████╗ ██╗ █████╗ ██╗ ██╗ ██╗ -// ██╔══██╗██╔════╝╚══██╔══╝██╔══██╗██╔══██╗██║██╔══██╗ ██║ ██║███║ -// ███████║███████╗ ██║ ███████║██████╔╝██║███████║ ██║ ██║╚██║ -// ██╔══██║╚════██║ ██║ ██╔══██║██╔══██╗██║██╔══██║ ╚██╗ ██╔╝ ██║ -// ██║ ██║███████║ ██║ ██║ ██║██║ ██║██║██║ ██║ ╚████╔╝ ██║ -// ╚═╝ ╚═╝╚══════╝ ╚═╝ ╚═╝ ╚═╝╚═╝ ╚═╝╚═╝╚═╝ ╚═╝ ╚═══╝ ╚═╝ -// -// Astaria v1 Lending -// Built on Starport https://github.com/astariaXYZ/starport -// Designed with love by Astaria Labs, Inc - -pragma solidity ^0.8.17; - -import {Starport} from "starport-core/Starport.sol"; -import {BasePricing} from "starport-core/pricing/BasePricing.sol"; -import {AdditionalTransfer} from "starport-core/lib/StarportLib.sol"; - -import {BaseStatus} from "v1-core/status/BaseStatus.sol"; - -import {SpentItem} from "seaport-types/src/lib/ConsiderationStructs.sol"; -import {FixedPointMathLib} from "solady/src/utils/FixedPointMathLib.sol"; - -abstract contract BaseRecallPricing is BasePricing { - /*´:°•.°+.*•´.*:˚.°*.˚•´.°:°•.°•.*•´.*:˚.°*.˚•´.°:°•.°+.*•´.*:*/ - /* EXTERNAL FUNCTIONS */ - /*.•°:°.´+˚.*°.˚:*.´•*.+°.•°:´*.´•*.•°.•°:°.´:•˚°.*°.˚:*.´+°.•*/ - - // @inheritdoc Pricing - function getRefinanceConsideration(Starport.Loan calldata loan, bytes memory newPricingData, address fulfiller) - external - view - virtual - override - returns ( - SpentItem[] memory repayConsideration, - SpentItem[] memory carryConsideration, - AdditionalTransfer[] memory recallConsideration - ) - { - Details memory oldDetails = abi.decode(loan.terms.pricingData, (Details)); - Details memory newDetails = abi.decode(newPricingData, (Details)); - bool isRecalled = BaseStatus(loan.terms.status).isRecalled(loan); - - if ((isRecalled && newDetails.rate >= oldDetails.rate) || (newDetails.rate < oldDetails.rate)) { - (repayConsideration, carryConsideration) = getPaymentConsideration(loan); - recallConsideration = new AdditionalTransfer[](0); - } - } -} diff --git a/src/pricing/CompoundInterestPricing.sol b/src/pricing/CompoundInterestPricing.sol index a4342f2..8fab631 100644 --- a/src/pricing/CompoundInterestPricing.sol +++ b/src/pricing/CompoundInterestPricing.sol @@ -13,11 +13,10 @@ pragma solidity ^0.8.17; import {Starport} from "starport-core/Starport.sol"; - -import {BaseRecallPricing} from "v1-core/pricing/BaseRecallPricing.sol"; +import {BasePricing} from "starport-core/pricing/BasePricing.sol"; import {AstariaV1Lib} from "v1-core/lib/AstariaV1Lib.sol"; -abstract contract CompoundInterestPricing is BaseRecallPricing { +abstract contract CompoundInterestPricing is BasePricing { /*´:°•.°+.*•´.*:˚.°*.˚•´.°:°•.°•.*•´.*:˚.°*.˚•´.°:°•.°+.*•´.*:*/ /* PUBLIC FUNCTIONS */ /*.•°:°.´+˚.*°.˚:*.´•*.+°.•°:´*.´•*.•°.•°:°.´:•˚°.*°.˚:*.´+°.•*/