Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into refactor/curve
Browse files Browse the repository at this point in the history
  • Loading branch information
MathisGD committed Nov 13, 2023
2 parents 222b04e + 5958fd4 commit b209956
Show file tree
Hide file tree
Showing 8 changed files with 31 additions and 11 deletions.
20 changes: 20 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
Copyright (c) 2023 Morpho Labs

Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
"Software"), to deal in the Software without restriction, including
without limitation the rights to use, copy, modify, merge, publish,
distribute, sublicense, and/or sell copies of the Software, and to
permit persons to whom the Software is furnished to do so, subject to
the following conditions:

The above copyright notice and this permission notice shall be
included in all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
4 changes: 2 additions & 2 deletions src/SpeedJumpIrm.sol
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: UNLICENSED
// SPDX-License-Identifier: MIT
pragma solidity 0.8.19;

import {IIrm} from "../lib/morpho-blue/src/interfaces/IIrm.sol";
Expand All @@ -12,7 +12,7 @@ import {WAD, MathLib as MorphoMathLib} from "../lib/morpho-blue/src/libraries/Ma

/// @title AdaptativeCurveIrm
/// @author Morpho Labs
/// @custom:contact security@morpho.xyz
/// @custom:contact security@morpho.org
contract AdaptativeCurveIrm is IIrm {
using MathLib for int256;
using MathLib for uint256;
Expand Down
4 changes: 2 additions & 2 deletions src/libraries/ErrorsLib.sol
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
// SPDX-License-Identifier: UNLICENSED
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.0;

/// @title ErrorsLib
/// @author Morpho Labs
/// @custom:contact security@morpho.xyz
/// @custom:contact security@morpho.org
/// @notice Library exposing error messages.
library ErrorsLib {
/// @dev Thrown when the input is too large to fit in the expected type.
Expand Down
4 changes: 2 additions & 2 deletions src/libraries/MathLib.sol
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: UNLICENSED
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.0;

import {ErrorsLib} from "./ErrorsLib.sol";
Expand All @@ -8,7 +8,7 @@ int256 constant WAD_INT = int256(WAD);

/// @title MathLib
/// @author Morpho Labs
/// @custom:contact security@morpho.xyz
/// @custom:contact security@morpho.org
/// @notice Library to manage fixed-point arithmetic and approximate the exponential function.
library MathLib {
using MathLib for uint128;
Expand Down
4 changes: 2 additions & 2 deletions src/libraries/UtilsLib.sol
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
// SPDX-License-Identifier: UNLICENSED
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.0;

/// @title UtilsLib
/// @author Morpho Labs
/// @custom:contact security@morpho.xyz
/// @custom:contact security@morpho.org
/// @notice Library exposing helpers.
library UtilsLib {
/// @dev Bounds `x` between `low` and `high`.
Expand Down
2 changes: 1 addition & 1 deletion test/MathLibTest.sol
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: UNLICENSED
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.0;

import {MathLib} from "../src/libraries/MathLib.sol";
Expand Down
2 changes: 1 addition & 1 deletion test/SpeedJumpIrmTest.sol
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: UNLICENSED
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.0;

import "../src/SpeedJumpIrm.sol";
Expand Down
2 changes: 1 addition & 1 deletion test/UtilsLibTest.sol
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: UNLICENSED
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.0;

import "../src/libraries/UtilsLib.sol";
Expand Down

0 comments on commit b209956

Please sign in to comment.