Skip to content

Commit

Permalink
chore: upgrade lib
Browse files Browse the repository at this point in the history 
* lib: update libs
* fix: add `view` modifier
* chore: update lint tools
* test: add write attribute to work with new amm-core
* gas: update snapshot
  • Loading branch information
@xenide
xenide authored Nov 23, 2024
1 parent 555a67b commit 84ab165
Show file tree
Hide file tree
Showing 9 changed files with 820 additions and 338 deletions.
104 changes: 52 additions & 52 deletions .gas-snapshot
View file
Original file line number Diff line number Diff line change
@@ -1,42 +1,42 @@
QueryProcessorTest:testFindNearestSample_CanFindExactValue(uint32,uint256,uint256,uint256) (runs: 256, μ: 66580346, ~: 74677417)
QueryProcessorTest:testFindNearestSample_CanFindIntermediateValue(uint32,uint256,uint256,uint256) (runs: 256, μ: 65654168, ~: 74637564)
QueryProcessorTest:testFindNearestSample_NotInitialized() (gas: 1056944892)
QueryProcessorTest:testFindNearestSample_OneSample(uint256) (runs: 256, μ: 80139, ~: 80169)
QueryProcessorTest:testGetInstantValue() (gas: 123891)
QueryProcessorTest:testGetInstantValue_NotInitialized(uint256) (runs: 256, μ: 19378, ~: 19378)
QueryProcessorTest:testGetInstantValue_NotInitialized_BeyondBufferSize(uint8,uint16) (runs: 256, μ: 68260435, ~: 68260368)
QueryProcessorTest:testGetPastAccumulator_BufferEmpty(uint8) (runs: 256, μ: 26888, ~: 26962)
QueryProcessorTest:testGetPastAccumulator_ExactMatch(uint32,uint256,uint256,uint16) (runs: 256, μ: 73163775, ~: 80971220)
QueryProcessorTest:testGetPastAccumulator_ExactMatch_LatestAccumulator(uint32,uint256,uint256) (runs: 256, μ: 69034009, ~: 77518108)
QueryProcessorTest:testGetPastAccumulator_ExactMatch_OldestAccumulator(uint32,uint256,uint256) (runs: 256, μ: 69063807, ~: 77549589)
QueryProcessorTest:testGetPastAccumulator_ExtrapolatesBeyondLatest(uint32,uint256,uint256,uint256) (runs: 256, μ: 65628240, ~: 74609149)
QueryProcessorTest:testGetPastAccumulator_InterpolatesBetweenPastAccumulators(uint32,uint256,uint256,uint256) (runs: 256, μ: 65662034, ~: 74643790)
QueryProcessorTest:testGetPastAccumulator_InvalidAgo(uint32,uint256,uint256,uint256) (runs: 256, μ: 65619855, ~: 74600885)
QueryProcessorTest:testGetPastAccumulator_QueryTooOld(uint32,uint256,uint256,uint256) (runs: 256, μ: 65631299, ~: 74610735)
QueryProcessorTest:testGetTimeWeightedAverage(uint32,uint256,uint256,uint256,uint256) (runs: 256, μ: 105247875, ~: 113034890)
QueryProcessorTest:testFindNearestSample_CanFindExactValue(uint32,uint256,uint256,uint256) (runs: 256, μ: 69038209, ~: 78939846)
QueryProcessorTest:testFindNearestSample_CanFindIntermediateValue(uint32,uint256,uint256,uint256) (runs: 256, μ: 68311518, ~: 79140121)
QueryProcessorTest:testFindNearestSample_NotInitialized() (gas: 1056944146)
QueryProcessorTest:testFindNearestSample_OneSample(uint256) (runs: 256, μ: 80622, ~: 80652)
QueryProcessorTest:testGetInstantValue() (gas: 124418)
QueryProcessorTest:testGetInstantValue_NotInitialized(uint256) (runs: 256, μ: 19400, ~: 19400)
QueryProcessorTest:testGetInstantValue_NotInitialized_BeyondBufferSize(uint8,uint16) (runs: 256, μ: 69204608, ~: 69204518)
QueryProcessorTest:testGetPastAccumulator_BufferEmpty(uint8) (runs: 256, μ: 26930, ~: 26984)
QueryProcessorTest:testGetPastAccumulator_ExactMatch(uint32,uint256,uint256,uint16) (runs: 256, μ: 73842560, ~: 83474413)
QueryProcessorTest:testGetPastAccumulator_ExactMatch_LatestAccumulator(uint32,uint256,uint256) (runs: 256, μ: 68671249, ~: 78734958)
QueryProcessorTest:testGetPastAccumulator_ExactMatch_OldestAccumulator(uint32,uint256,uint256) (runs: 256, μ: 68701118, ~: 78766725)
QueryProcessorTest:testGetPastAccumulator_ExtrapolatesBeyondLatest(uint32,uint256,uint256,uint256) (runs: 256, μ: 68285121, ~: 79111756)
QueryProcessorTest:testGetPastAccumulator_InterpolatesBetweenPastAccumulators(uint32,uint256,uint256,uint256) (runs: 256, μ: 68319459, ~: 79146413)
QueryProcessorTest:testGetPastAccumulator_InvalidAgo(uint32,uint256,uint256,uint256) (runs: 256, μ: 68276708, ~: 79102843)
QueryProcessorTest:testGetPastAccumulator_QueryTooOld(uint32,uint256,uint256,uint256) (runs: 256, μ: 68288213, ~: 79113100)
QueryProcessorTest:testGetTimeWeightedAverage(uint32,uint256,uint256,uint256,uint256) (runs: 256, μ: 103845966, ~: 112262763)
QueryProcessorTest:testGetTimeWeightedAverage_BadSecs() (gas: 10981)
ReservoirPriceOracleTest:testClearRoute() (gas: 52216)
ReservoirPriceOracleTest:testClearRoute_AllWordsCleared() (gas: 159654)
ReservoirPriceOracleTest:testDesignatePair() (gas: 29038)
ReservoirPriceOracleTest:testDesignatePair_IncorrectPair() (gas: 21133)
ReservoirPriceOracleTest:testClearRoute() (gas: 52209)
ReservoirPriceOracleTest:testClearRoute_AllWordsCleared() (gas: 159631)
ReservoirPriceOracleTest:testDesignatePair() (gas: 29056)
ReservoirPriceOracleTest:testDesignatePair_IncorrectPair() (gas: 21148)
ReservoirPriceOracleTest:testDesignatePair_NotOwner() (gas: 17541)
ReservoirPriceOracleTest:testDesignatePair_TokenOrderReversed() (gas: 30605)
ReservoirPriceOracleTest:testGetQuote(uint256,uint256) (runs: 256, μ: 33689, ~: 33805)
ReservoirPriceOracleTest:testGetQuote(uint256,uint256) (runs: 256, μ: 33696, ~: 33805)
ReservoirPriceOracleTest:testGetQuote_AmountInTooLarge() (gas: 12950)
ReservoirPriceOracleTest:testGetQuote_BaseIsVault(uint256) (runs: 256, μ: 401380, ~: 401124)
ReservoirPriceOracleTest:testGetQuote_ComplicatedDecimals() (gas: 10127860)
ReservoirPriceOracleTest:testGetQuote_Inverse(uint256,uint256) (runs: 256, μ: 35812, ~: 35985)
ReservoirPriceOracleTest:testGetQuote_MultipleHops() (gas: 111603)
ReservoirPriceOracleTest:testGetQuote_MultipleHops_Inverse() (gas: 111924)
ReservoirPriceOracleTest:testGetQuote_MultipleHops_PriceZero() (gas: 122238)
ReservoirPriceOracleTest:testGetQuote_NoFallbackOracle() (gas: 20788)
ReservoirPriceOracleTest:testGetQuote_BaseIsVault(uint256) (runs: 256, μ: 401362, ~: 401124)
ReservoirPriceOracleTest:testGetQuote_ComplicatedDecimals() (gas: 10361834)
ReservoirPriceOracleTest:testGetQuote_Inverse(uint256,uint256) (runs: 256, μ: 35820, ~: 35987)
ReservoirPriceOracleTest:testGetQuote_MultipleHops() (gas: 111582)
ReservoirPriceOracleTest:testGetQuote_MultipleHops_Inverse() (gas: 111900)
ReservoirPriceOracleTest:testGetQuote_MultipleHops_PriceZero() (gas: 122208)
ReservoirPriceOracleTest:testGetQuote_NoFallbackOracle() (gas: 20776)
ReservoirPriceOracleTest:testGetQuote_PriceZero() (gas: 15930)
ReservoirPriceOracleTest:testGetQuote_RandomizeAllParam_1HopRoute(uint256,uint256,address,address,uint8,uint8) (runs: 256, μ: 5198028, ~: 5198035)
ReservoirPriceOracleTest:testGetQuote_RandomizeAllParam_2HopRoute(uint256,uint256,uint256,address,address,address,uint8,uint8,uint8) (runs: 256, μ: 10269544, ~: 10269654)
ReservoirPriceOracleTest:testGetQuote_RandomizeAllParam_1HopRoute(uint256,uint256,address,address,uint8,uint8) (runs: 256, μ: 5316035, ~: 5316010)
ReservoirPriceOracleTest:testGetQuote_RandomizeAllParam_2HopRoute(uint256,uint256,uint256,address,address,address,uint8,uint8,uint8) (runs: 256, μ: 10503497, ~: 10503613)
ReservoirPriceOracleTest:testGetQuote_SameBaseQuote(uint256,address) (runs: 256, μ: 8927, ~: 8927)
ReservoirPriceOracleTest:testGetQuote_UseFallback() (gas: 38250)
ReservoirPriceOracleTest:testGetQuote_UseFallback() (gas: 38244)
ReservoirPriceOracleTest:testGetQuote_ZeroIn() (gas: 36635)
ReservoirPriceOracleTest:testGetQuotes(uint256,uint256) (runs: 256, μ: 26211, ~: 26327)
ReservoirPriceOracleTest:testGetQuotes(uint256,uint256) (runs: 256, μ: 26240, ~: 26349)
ReservoirPriceOracleTest:testPriceCache_Inverted() (gas: 21949)
ReservoirPriceOracleTest:testSetFallbackOracle_NotOwner() (gas: 10928)
ReservoirPriceOracleTest:testSetRoute() (gas: 61014)
Expand All @@ -45,28 +45,28 @@ ReservoirPriceOracleTest:testSetRoute_InvalidRoute() (gas: 20106)
ReservoirPriceOracleTest:testSetRoute_InvalidRouteLength() (gas: 19253)
ReservoirPriceOracleTest:testSetRoute_MultipleHops() (gas: 201105)
ReservoirPriceOracleTest:testSetRoute_NotSorted() (gas: 13006)
ReservoirPriceOracleTest:testSetRoute_OverwriteExisting() (gas: 169491)
ReservoirPriceOracleTest:testSetRoute_OverwriteExisting() (gas: 169482)
ReservoirPriceOracleTest:testSetRoute_SameToken() (gas: 13019)
ReservoirPriceOracleTest:testUndesignatePair() (gas: 30215)
ReservoirPriceOracleTest:testUndesignatePair() (gas: 30237)
ReservoirPriceOracleTest:testUndesignatePair_NotOwner() (gas: 15344)
ReservoirPriceOracleTest:testUpdatePrice_AboveThresholdBelowMaxReward(uint256) (runs: 256, μ: 163637, ~: 163657)
ReservoirPriceOracleTest:testUpdatePrice_BelowThreshold(uint256) (runs: 256, μ: 148532, ~: 148476)
ReservoirPriceOracleTest:testUpdatePrice_BeyondMaxReward(uint256) (runs: 256, μ: 161152, ~: 161177)
ReservoirPriceOracleTest:testUpdatePrice_FirstUpdate() (gas: 152255)
ReservoirPriceOracleTest:testUpdatePrice_IntermediateRoutes() (gas: 15927172)
ReservoirPriceOracleTest:testUpdatePrice_PriceOutOfRange() (gas: 5288225)
ReservoirPriceOracleTest:testUpdatePrice_RewardEligible_ContractNoReceive() (gas: 151436)
ReservoirPriceOracleTest:testUpdatePrice_RewardEligible_InsufficientReward(uint256) (runs: 256, μ: 209567, ~: 209771)
ReservoirPriceOracleTest:testUpdatePrice_RewardEligible_ZeroRecipient() (gas: 145106)
ReservoirPriceOracleTest:testUpdateRewardGasAmount() (gas: 19027)
ReservoirPriceOracleTest:testUpdateRewardGasAmount_NotOwner() (gas: 10930)
ReservoirPriceOracleTest:testUpdateTwapPeriod(uint256) (runs: 256, μ: 21569, ~: 21656)
ReservoirPriceOracleTest:testUpdateTwapPeriod_InvalidTwapPeriod(uint256) (runs: 256, μ: 17709, ~: 17994)
ReservoirPriceOracleTest:testWritePriceCache(uint256) (runs: 256, μ: 30063, ~: 29807)
ReservoirPriceOracleTest:testUpdatePrice_AboveThresholdBelowMaxReward(uint256) (runs: 256, μ: 164717, ~: 164737)
ReservoirPriceOracleTest:testUpdatePrice_BelowThreshold(uint256) (runs: 256, μ: 149562, ~: 149238)
ReservoirPriceOracleTest:testUpdatePrice_BeyondMaxReward(uint256) (runs: 256, μ: 162212, ~: 162240)
ReservoirPriceOracleTest:testUpdatePrice_FirstUpdate() (gas: 153342)
ReservoirPriceOracleTest:testUpdatePrice_IntermediateRoutes() (gas: 16283142)
ReservoirPriceOracleTest:testUpdatePrice_PriceOutOfRange() (gas: 5408263)
ReservoirPriceOracleTest:testUpdatePrice_RewardEligible_ContractNoReceive() (gas: 152501)
ReservoirPriceOracleTest:testUpdatePrice_RewardEligible_InsufficientReward(uint256) (runs: 256, μ: 210795, ~: 211013)
ReservoirPriceOracleTest:testUpdatePrice_RewardEligible_ZeroRecipient() (gas: 146149)
ReservoirPriceOracleTest:testUpdateRewardGasAmount() (gas: 19038)
ReservoirPriceOracleTest:testUpdateRewardGasAmount_NotOwner() (gas: 10952)
ReservoirPriceOracleTest:testUpdateTwapPeriod(uint256) (runs: 256, μ: 21576, ~: 21667)
ReservoirPriceOracleTest:testUpdateTwapPeriod_InvalidTwapPeriod(uint256) (runs: 256, μ: 17701, ~: 17994)
ReservoirPriceOracleTest:testWritePriceCache(uint256) (runs: 256, μ: 30057, ~: 29819)
RoutesLibTest:testGetDecimalDifference() (gas: 3966)
RoutesLibTest:testIsCompositeRoute() (gas: 4332)
RoutesLibTest:testPackSimplePrice(int8,uint256) (runs: 256, μ: 8097, ~: 7862)
SamplesTest:testAccumulator() (gas: 3952)
RoutesLibTest:testPackSimplePrice(int8,uint256) (runs: 256, μ: 8083, ~: 7862)
SamplesTest:testAccumulator() (gas: 3930)
SamplesTest:testAccumulator_BadVariableRequest() (gas: 3355)
SamplesTest:testInstant() (gas: 3902)
SamplesTest:testInstant_BadVariableRequest() (gas: 3398)
SamplesTest:testInstant() (gas: 3880)
SamplesTest:testInstant_BadVariableRequest() (gas: 3376)
2 changes: 1 addition & 1 deletion lib/amm-core
Submodule amm-core updated 30 files
+205 −195 .gas-snapshot
+1 −0 foundry.toml
+1,032 −1,836 package-lock.json
+2 −2 package.json
+1 −1 script/BaseScript.sol
+4 −4 script/optimized-deployer-meta
+4 −4 script/unoptimized-deployer-meta
+3 −1 src/.solhint.json
+2 −1 src/Constants.sol
+1 −1 src/GenericFactory.sol
+5 −4 src/ReservoirDeployer.sol
+31 −13 src/ReservoirPair.sol
+28 −16 src/asset-management/AaveManager.sol
+1 −1 src/curve/constant-product/ConstantProductPair.sol
+2 −5 src/curve/stable/StablePair.sol
+0 −2 src/interfaces/aave/IPool.sol
+4 −0 src/libraries/Bytes32.sol
+1 −1 src/libraries/LogCompression.sol
+0 −2 src/structs/Observation.sol
+3 −1 test/.solhint.json
+2 −3 test/__fixtures/BaseTest.sol
+1 −1 test/__mocks/ReturnAssetExploit.sol
+2 −2 test/differential/LogCompression.t.sol
+65 −10 test/integration/Aave.t.sol
+1 −1 test/interfaces/IUSDC.sol
+1 −2 test/unit/ConstantProductPair.t.sol
+2 −5 test/unit/GenericFactory.t.sol
+158 −24 test/unit/OracleWriter.t.sol
+1 −33 test/unit/ReservoirPair.t.sol
+2 −2 test/unit/StablePair.t.sol
2 changes: 1 addition & 1 deletion lib/forge-std
Submodule forge-std updated 32 files
+6 −12 .github/workflows/ci.yml
+3 −1 .github/workflows/sync.yml
+193 −0 CONTRIBUTING.md
+17 −1 README.md
+2 −2 foundry.toml
+1 −1 package.json
+12 −1 scripts/vm.py
+1 −1 src/StdAssertions.sol
+21 −8 src/StdChains.sol
+3 −3 src/StdCheats.sol
+18 −3 src/StdInvariant.sol
+104 −0 src/StdJson.sol
+1 −1 src/StdStorage.sol
+104 −0 src/StdToml.sol
+1 −1 src/StdUtils.sol
+592 −63 src/Vm.sol
+635 −608 src/console.sol
+1 −1,555 src/console2.sol
+2 −2 src/interfaces/IERC4626.sol
+1 −5 src/mocks/MockERC721.sol
+693 −4 src/safeconsole.sol
+1 −1 test/StdAssertions.t.sol
+28 −22 test/StdChains.t.sol
+11 −11 test/StdCheats.t.sol
+12 −12 test/StdError.t.sol
+1 −1 test/StdJson.t.sol
+4 −14 test/StdMath.t.sol
+13 −5 test/StdStorage.t.sol
+1 −1 test/StdStyle.t.sol
+1 −1 test/StdToml.t.sol
+12 −12 test/StdUtils.t.sol
+9 −6 test/Vm.t.sol
2 changes: 1 addition & 1 deletion lib/solady
Submodule solady updated 18 files
+1 −0 README.md
+1 −1 package.json
+1 −0 src/Milady.sol
+103 −0 src/accounts/ERC7821.sol
+20 −0 src/utils/EfficientHashLib.sol
+28 −0 src/utils/LibBytes.sol
+220 −0 src/utils/LibCall.sol
+30 −0 src/utils/P256.sol
+14 −9 src/utils/SignatureCheckerLib.sol
+28 −0 src/utils/g/LibBytes.sol
+111 −0 test/ERC7821.t.sol
+21 −0 test/EfficientHashLib.t.sol
+13 −0 test/LibBytes.t.sol
+59 −0 test/LibCall.t.sol
+2 −0 test/LibString.t.sol
+14 −0 test/P256.t.sol
+6 −0 test/SignatureCheckerLib.t.sol
+27 −0 test/utils/mocks/MockERC7821.sol
Loading

0 comments on commit 84ab165

Please sign in to comment.