From 57890752adee2f7847522319d63a68b0b0654b01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=9Fingen?= Date: Sun, 24 Jul 2022 21:35:23 +0200 Subject: [PATCH 1/2] Pin solidity version for core contracts to 0.8.15 --- LUSDChickenBonds/src/BLUSDToken.sol | 2 +- LUSDChickenBonds/src/BondNFT.sol | 2 +- LUSDChickenBonds/src/ChickenBondManager.sol | 2 +- LUSDChickenBonds/src/Proxy/ChickenBondOperationsScript.sol | 2 +- LUSDChickenBonds/src/utils/BaseMath.sol | 2 +- LUSDChickenBonds/src/utils/ChickenMath.sol | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/LUSDChickenBonds/src/BLUSDToken.sol b/LUSDChickenBonds/src/BLUSDToken.sol index a447f1d6..21ff7e1e 100644 --- a/LUSDChickenBonds/src/BLUSDToken.sol +++ b/LUSDChickenBonds/src/BLUSDToken.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity ^0.8.10; +pragma solidity 0.8.15; import "openzeppelin-contracts/contracts/access/Ownable.sol"; import "openzeppelin-contracts/contracts/token/ERC20/ERC20.sol"; diff --git a/LUSDChickenBonds/src/BondNFT.sol b/LUSDChickenBonds/src/BondNFT.sol index b72950aa..6b5a271b 100644 --- a/LUSDChickenBonds/src/BondNFT.sol +++ b/LUSDChickenBonds/src/BondNFT.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity ^0.8.10; +pragma solidity 0.8.15; import "openzeppelin-contracts/contracts/token/ERC721/extensions/ERC721Enumerable.sol"; import "openzeppelin-contracts/contracts/access/Ownable.sol"; diff --git a/LUSDChickenBonds/src/ChickenBondManager.sol b/LUSDChickenBonds/src/ChickenBondManager.sol index 58ddaded..561eeb13 100644 --- a/LUSDChickenBonds/src/ChickenBondManager.sol +++ b/LUSDChickenBonds/src/ChickenBondManager.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity ^0.8.10; +pragma solidity 0.8.15; import "openzeppelin-contracts/contracts/utils/math/Math.sol"; import "openzeppelin-contracts/contracts/token/ERC20/IERC20.sol"; diff --git a/LUSDChickenBonds/src/Proxy/ChickenBondOperationsScript.sol b/LUSDChickenBonds/src/Proxy/ChickenBondOperationsScript.sol index 6e2cfb93..a2b2a4d4 100644 --- a/LUSDChickenBonds/src/Proxy/ChickenBondOperationsScript.sol +++ b/LUSDChickenBonds/src/Proxy/ChickenBondOperationsScript.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.8.10; +pragma solidity 0.8.15; import "../Interfaces/IChickenBondManager.sol"; import "../Interfaces/ICurvePool.sol"; diff --git a/LUSDChickenBonds/src/utils/BaseMath.sol b/LUSDChickenBonds/src/utils/BaseMath.sol index b68a85e4..8dbe7ddc 100644 --- a/LUSDChickenBonds/src/utils/BaseMath.sol +++ b/LUSDChickenBonds/src/utils/BaseMath.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -pragma solidity ^0.8.10; +pragma solidity 0.8.15; contract BaseMath { diff --git a/LUSDChickenBonds/src/utils/ChickenMath.sol b/LUSDChickenBonds/src/utils/ChickenMath.sol index d92f5176..ae270c08 100644 --- a/LUSDChickenBonds/src/utils/ChickenMath.sol +++ b/LUSDChickenBonds/src/utils/ChickenMath.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: MIT -pragma solidity ^0.8.10; +pragma solidity 0.8.15; import "./BaseMath.sol"; From 32f036fe7ae6ce8c2896b685b05fcb97a8f994fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=9Fingen?= Date: Mon, 25 Jul 2022 10:31:40 +0200 Subject: [PATCH 2/2] test: Increase check threshold for second first chicken in test --- .../src/test/ChickenBondManagerMainnetOnlyTest.t.sol | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LUSDChickenBonds/src/test/ChickenBondManagerMainnetOnlyTest.t.sol b/LUSDChickenBonds/src/test/ChickenBondManagerMainnetOnlyTest.t.sol index f6dad0ed..01be59bc 100644 --- a/LUSDChickenBonds/src/test/ChickenBondManagerMainnetOnlyTest.t.sol +++ b/LUSDChickenBonds/src/test/ChickenBondManagerMainnetOnlyTest.t.sol @@ -269,7 +269,7 @@ contract ChickenBondManagerMainnetOnlyTest is BaseTest, MainnetTestSetup { assertRelativeError( lusdToken.balanceOf(address(curveLiquidityGauge)), acquiredLUSDBeforeChickenIn + _getChickenInFeeForAmount(bondAmount1) + _getChickenInFeeForAmount(bondAmount2), - 4e13, // 0.004 % + 5e13, // 0.005 % "Rewards contract balance mismatch" ); }