update lib

GenerationSoftware · Apr 17, 2024 · 0b1b0b7 · 0b1b0b7
1 parent e8d1d3f
commit 0b1b0b7
Show file tree

Hide file tree

Showing 12 changed files with 11 additions and 13 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,7 +1,6 @@
 [submodule "lib/pt-v5-prize-pool"]
 	path = lib/pt-v5-prize-pool
 	url = https://github.com/generationsoftware/pt-v5-prize-pool
-	branch = prod-deploy-2
 [submodule "lib/prb-math"]
 	path = lib/prb-math
 	url = https://github.com/PaulRBerg/prb-math
@@ -17,4 +16,3 @@
 [submodule "lib/pt-v5-liquidator-interfaces"]
 	path = lib/pt-v5-liquidator-interfaces
 	url = https://github.com/generationsoftware/pt-v5-liquidator-interfaces
-	branch = prod-deploy-2
diff --git a/.solhint.json b/.solhint.json
@@ -3,7 +3,7 @@
   "plugins": ["prettier"],
   "rules": {
     "avoid-low-level-calls": "off",
-    "compiler-version": ["error", "0.8.19"],
+    "compiler-version": ["error", "0.8.24"],
     "func-visibility": "off",
     "no-empty-blocks": "off",
     "no-inline-assembly": "off"

diff --git a/foundry.toml b/foundry.toml
@@ -3,6 +3,6 @@ src = 'src'
 out = 'out'
 test = 'test'
 libs = ['lib']
-solc = "0.8.19"
+solc = "0.8.24"
 fs_permissions = [{ access = "read", path = "./broadcast"}]
 gas_reports = ["*"]
diff --git a/lib/forge-std b/lib/forge-std
diff --git a/lib/openzeppelin-contracts b/lib/openzeppelin-contracts
diff --git a/lib/prb-math b/lib/prb-math
diff --git a/lib/pt-v5-liquidator-interfaces b/lib/pt-v5-liquidator-interfaces
diff --git a/lib/pt-v5-prize-pool b/lib/pt-v5-prize-pool
diff --git a/src/VaultBooster.sol b/src/VaultBooster.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.19;
+pragma solidity ^0.8.24;
 
 import { ILiquidationSource } from "pt-v5-liquidator-interfaces/ILiquidationSource.sol";
 import { PrizePool, IERC20, TwabController } from "pt-v5-prize-pool/PrizePool.sol";

diff --git a/src/VaultBoosterFactory.sol b/src/VaultBoosterFactory.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.19;
+pragma solidity ^0.8.24;
 
 import { VaultBooster, PrizePool } from "./VaultBooster.sol";
 

diff --git a/test/VaultBooster.t.sol b/test/VaultBooster.t.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.19;
+pragma solidity 0.8.24;
 
 import "forge-std/Test.sol";
 

diff --git a/test/VaultBoosterFactory.t.sol b/test/VaultBoosterFactory.t.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.19;
+pragma solidity 0.8.24;
 
 import "forge-std/Test.sol";
+1 −0		.gitattributes
+0 −3		.gitmodules
+1 −1		README.md
+1 −1		foundry.toml
+0 −1		lib/ds-test
+1 −1		package.json
+635 −0		scripts/vm.py
+518 −225		src/StdAssertions.sol
+19 −5		src/StdChains.sol
+2 −2		src/StdCheats.sol
+7 −11		src/StdJson.sol
+201 −106		src/StdStorage.sol
+179 −0		src/StdToml.sol
+61 −33		src/StdUtils.sol
+4 −4		src/Test.sol
+1,357 −462		src/Vm.sol
+234 −0		src/mocks/MockERC20.sol
+235 −0		src/mocks/MockERC721.sol
+39 −909		test/StdAssertions.t.sol
+31 −30		test/StdChains.t.sol
+19 −11		test/StdCheats.t.sol
+3 −1		test/StdError.t.sol
+49 −0		test/StdJson.t.sol
+8 −8		test/StdMath.t.sol
+159 −11		test/StdStorage.t.sol
+49 −0		test/StdToml.t.sol
+20 −20		test/StdUtils.t.sol
+3 −3		test/Vm.t.sol
+8 −0		test/fixtures/test.json
+6 −0		test/fixtures/test.toml
+441 −0		test/mocks/MockERC20.t.sol
+721 −0		test/mocks/MockERC721.t.sol
+1 −1		.github/actions/setup/action.yml
+13 −0		CHANGELOG.md
+21 −10		contracts/metatx/ERC2771Context.sol
+19 −0		contracts/mocks/Base64Dirty.sol
+6 −1		contracts/mocks/ERC2771ContextMock.sol
+1 −1		contracts/package.json
+1 −1		contracts/token/ERC20/extensions/ERC20Permit.sol
+1 −1		contracts/token/ERC20/extensions/IERC20Permit.sol
+19 −10		contracts/utils/Base64.sol
+5 −1		contracts/utils/Context.sol
+17 −3		contracts/utils/Multicall.sol
+2 −2		package-lock.json
+1 −1		package.json
+54 −1		test/metatx/ERC2771Context.test.js
+11 −1		test/utils/Base64.test.js
+0 −9		.github/ISSUE_TEMPLATE/1-bug-report.yml
+27 −3		.github/workflows/ci.yml
+0 −8		.gitmodules
+22 −0		CHANGELOG.md
+16 −20		README.md
+0 −1		foundry.toml
+0 −1		lib/forge-std
+0 −1		lib/prb-test
+6 −6		package.json
+314 −37		pnpm-lock.yaml
+2 −2		remappings.txt
+1 −1		src/Common.sol
+1 −1		src/sd59x18/Errors.sol
+0 −5		src/test/Assertions.sol
+0 −5		src/test/Utils.sol
+0 −1		src/ud2x18/Casting.sol
+1 −1		src/ud60x18/Math.sol
+2 −9		test/Base.t.sol
+0 −1		test/fuzz/sd1x18/casting/Casting.t.sol
+0 −2		test/fuzz/sd59x18/casting/Casting.t.sol
+0 −3		test/fuzz/sd59x18/helpers/Helpers.t.sol
+1 −2		test/fuzz/ud60x18/helpers/Helpers.t.sol
+2 −3		test/unit/sd59x18/SD59x18.t.sol
+0 −1		test/unit/sd59x18/conversion/convert-from/convertFrom.t.sol
+1 −1		test/unit/sd59x18/math/div/div.t.sol
+0 −1		test/unit/sd59x18/math/frac/frac.t.sol
+2 −2		test/unit/sd59x18/math/inv/inv.t.sol
+0 −2		test/unit/sd59x18/math/mul/mul.t.sol
+0 −1		test/unit/sd59x18/math/pow/pow.t.sol
+1 −1		test/unit/sd59x18/math/sqrt/sqrt.t.sol
+2 −3		test/unit/ud60x18/UD60x18.t.sol
+0 −1		test/unit/ud60x18/conversion/convert-from/convertFrom.t.sol
+1 −1		test/unit/ud60x18/math/div/div.t.sol
+1 −1		test/unit/ud60x18/math/gm/gm.t.sol
+1 −1		test/unit/ud60x18/math/inv/inv.t.sol
+0 −2		test/unit/ud60x18/math/ln/ln.t.sol
+0 −2		test/unit/ud60x18/math/log10/log10.t.sol
+0 −2		test/unit/ud60x18/math/log2/log2.t.sol
+0 −2		test/unit/ud60x18/math/mul/mul.t.sol
+0 −1		test/unit/ud60x18/math/pow/pow.t.sol
+1 −1		test/utils/Assertions.sol
+65 −65		test/utils/Utils.sol
+2 −2		.github/workflows/coverage.yml
+0 −3		.gitmodules
+1 −1		LICENSE
+1 −1		README.md
+8 −4		foundry.toml
+1 −1		lib/forge-std
+1 −1		lib/openzeppelin-contracts
+1 −1		lib/prb-math
+1 −1		lib/pt-v5-twab-controller
+1 −1		lib/uniform-random-number
+1 −2		remappings.txt
+584 −452		src/PrizePool.sol
+235 −227		src/abstract/TieredLiquidityDistributor.sol
+93 −300		src/libraries/DrawAccumulatorLib.sol
+7 −9		src/libraries/TierCalculationLib.sol
+0 −70		src/libraries/UD34x4.sol
+907 −266		test/PrizePool.t.sol
+282 −62		test/abstract/TieredLiquidityDistributor.t.sol
+17 −15		test/abstract/helper/TieredLiquidityDistributorWrapper.sol
+1 −1		test/invariants/DrawAccumulatorInvariants.t.sol
+8 −18		test/invariants/PrizePoolInvariants.t.sol
+1 −1		test/invariants/TieredLiquidityDistributorInvariants.t.sol
+20 −0		test/invariants/helpers/CurrentTime.sol
+31 −0		test/invariants/helpers/CurrentTimeConsumer.sol
+8 −3		test/invariants/helpers/DrawAccumulatorFuzzHarness.sol
+136 −39		test/invariants/helpers/PrizePoolFuzzHarness.sol
+16 −16		test/invariants/helpers/TieredLiquidityDistributorFuzzHarness.sol
+39 −60		test/libraries/DrawAccumulatorLib.t.sol
+11 −6		test/libraries/TierCalculationLib.t.sol
+0 −46		test/libraries/UD34x4.t.sol
+11 −42		test/wrappers/DrawAccumulatorLibWrapper.sol