Skip to content

Commit 234ab3d

Browse files
xenidexenide
committed
lib: update openzeppelin
1 parent 94db538 commit 234ab3d

File tree

4 files changed

+71
-91
lines changed

4 files changed

+71
-91
lines changed

‎.gas-snapshot‎

Lines changed: 56 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -1,79 +1,79 @@
1-
QueryProcessorTest:testFindNearestSample_CanFindExactValue(uint32,uint256,uint256,uint256) (runs: 256, μ: 68422630, ~: 77367688)
2-
QueryProcessorTest:testFindNearestSample_CanFindIntermediateValue(uint32,uint256,uint256,uint256) (runs: 256, μ: 67746277, ~: 78113472)
3-
QueryProcessorTest:testFindNearestSample_NotInitialized() (gas: 1056944146)
4-
QueryProcessorTest:testFindNearestSample_OneSample(uint256) (runs: 256, μ: 81343, ~: 81376)
5-
QueryProcessorTest:testGetInstantValue() (gas: 124772)
6-
QueryProcessorTest:testGetInstantValue_NotInitialized(uint256) (runs: 256, μ: 19400, ~: 19400)
7-
QueryProcessorTest:testGetInstantValue_NotInitialized_BeyondBufferSize(uint8,uint16) (runs: 256, μ: 69937936, ~: 69937878)
8-
QueryProcessorTest:testGetPastAccumulator_BufferEmpty(uint8) (runs: 256, μ: 26920, ~: 26984)
9-
QueryProcessorTest:testGetPastAccumulator_ExactMatch(uint32,uint256,uint256,uint16) (runs: 256, μ: 75286080, ~: 83717912)
10-
QueryProcessorTest:testGetPastAccumulator_ExactMatch_LatestAccumulator(uint32,uint256,uint256) (runs: 256, μ: 68556876, ~: 76913728)
11-
QueryProcessorTest:testGetPastAccumulator_ExactMatch_OldestAccumulator(uint32,uint256,uint256) (runs: 256, μ: 68587555, ~: 76946287)
12-
QueryProcessorTest:testGetPastAccumulator_ExtrapolatesBeyondLatest(uint32,uint256,uint256,uint256) (runs: 256, μ: 67720184, ~: 78085305)
13-
QueryProcessorTest:testGetPastAccumulator_InterpolatesBetweenPastAccumulators(uint32,uint256,uint256,uint256) (runs: 256, μ: 67754393, ~: 78119959)
14-
QueryProcessorTest:testGetPastAccumulator_InvalidAgo(uint32,uint256,uint256,uint256) (runs: 256, μ: 67711313, ~: 78076536)
15-
QueryProcessorTest:testGetPastAccumulator_QueryTooOld(uint32,uint256,uint256,uint256) (runs: 256, μ: 67723265, ~: 78086905)
16-
QueryProcessorTest:testGetTimeWeightedAverage(uint32,uint256,uint256,uint256,uint256) (runs: 256, μ: 109837037, ~: 118527371)
1+
QueryProcessorTest:testFindNearestSample_CanFindExactValue(uint32,uint256,uint256,uint256) (runs: 256, μ: 65490604, ~: 74005655)
2+
QueryProcessorTest:testFindNearestSample_CanFindIntermediateValue(uint32,uint256,uint256,uint256) (runs: 256, μ: 65540929, ~: 74804264)
3+
QueryProcessorTest:testFindNearestSample_NotInitialized() (gas: 1056939704)
4+
QueryProcessorTest:testFindNearestSample_OneSample(uint256) (runs: 256, μ: 78761, ~: 78793)
5+
QueryProcessorTest:testGetInstantValue() (gas: 121806)
6+
QueryProcessorTest:testGetInstantValue_NotInitialized(uint256) (runs: 256, μ: 17238, ~: 17238)
7+
QueryProcessorTest:testGetInstantValue_NotInitialized_BeyondBufferSize(uint8,uint16) (runs: 256, μ: 69073598, ~: 69073508)
8+
QueryProcessorTest:testGetPastAccumulator_BufferEmpty(uint8) (runs: 256, μ: 24753, ~: 24812)
9+
QueryProcessorTest:testGetPastAccumulator_ExactMatch(uint32,uint256,uint256,uint16) (runs: 256, μ: 72676185, ~: 82231785)
10+
QueryProcessorTest:testGetPastAccumulator_ExactMatch_LatestAccumulator(uint32,uint256,uint256) (runs: 256, μ: 68587637, ~: 76938384)
11+
QueryProcessorTest:testGetPastAccumulator_ExactMatch_OldestAccumulator(uint32,uint256,uint256) (runs: 256, μ: 68616564, ~: 76968841)
12+
QueryProcessorTest:testGetPastAccumulator_ExtrapolatesBeyondLatest(uint32,uint256,uint256,uint256) (runs: 256, μ: 65516447, ~: 74777961)
13+
QueryProcessorTest:testGetPastAccumulator_InterpolatesBetweenPastAccumulators(uint32,uint256,uint256,uint256) (runs: 256, μ: 65548584, ~: 74810264)
14+
QueryProcessorTest:testGetPastAccumulator_InvalidAgo(uint32,uint256,uint256,uint256) (runs: 256, μ: 65509904, ~: 74771184)
15+
QueryProcessorTest:testGetPastAccumulator_QueryTooOld(uint32,uint256,uint256,uint256) (runs: 256, μ: 65519390, ~: 74779058)
16+
QueryProcessorTest:testGetTimeWeightedAverage(uint32,uint256,uint256,uint256,uint256) (runs: 256, μ: 103033395, ~: 111298789)
1717
QueryProcessorTest:testGetTimeWeightedAverage_BadSecs() (gas: 10981)
18-
ReservoirPriceOracleTest:testClearRoute() (gas: 52354)
19-
ReservoirPriceOracleTest:testClearRoute_AllWordsCleared() (gas: 160260)
20-
ReservoirPriceOracleTest:testDesignatePair() (gas: 29133)
21-
ReservoirPriceOracleTest:testDesignatePair_IncorrectPair() (gas: 21174)
18+
ReservoirPriceOracleTest:testClearRoute() (gas: 55690)
19+
ReservoirPriceOracleTest:testClearRoute_AllWordsCleared() (gas: 168770)
20+
ReservoirPriceOracleTest:testDesignatePair() (gas: 29150)
21+
ReservoirPriceOracleTest:testDesignatePair_IncorrectPair() (gas: 21191)
2222
ReservoirPriceOracleTest:testDesignatePair_NotOwner() (gas: 17537)
23-
ReservoirPriceOracleTest:testDesignatePair_TokenOrderReversed() (gas: 30736)
24-
ReservoirPriceOracleTest:testGetQuote(uint256,uint256) (runs: 256, μ: 33769, ~: 33864)
23+
ReservoirPriceOracleTest:testDesignatePair_TokenOrderReversed() (gas: 30753)
24+
ReservoirPriceOracleTest:testGetQuote(uint256,uint256) (runs: 256, μ: 37874, ~: 37982)
2525
ReservoirPriceOracleTest:testGetQuote_AmountInTooLarge() (gas: 12952)
26-
ReservoirPriceOracleTest:testGetQuote_BaseIsVault(uint256) (runs: 256, μ: 401411, ~: 401171)
27-
ReservoirPriceOracleTest:testGetQuote_ComplicatedDecimals() (gas: 10362417)
26+
ReservoirPriceOracleTest:testGetQuote_BaseIsVault(uint256) (runs: 256, μ: 401378, ~: 401119)
27+
ReservoirPriceOracleTest:testGetQuote_ComplicatedDecimals() (gas: 9909910)
2828
ReservoirPriceOracleTest:testGetQuote_ERC4626AssetFails() (gas: 21389)
29-
ReservoirPriceOracleTest:testGetQuote_Inverse(uint256,uint256) (runs: 256, μ: 35949, ~: 36103)
30-
ReservoirPriceOracleTest:testGetQuote_MultipleHops() (gas: 112145)
31-
ReservoirPriceOracleTest:testGetQuote_MultipleHops_Inverse() (gas: 112371)
32-
ReservoirPriceOracleTest:testGetQuote_MultipleHops_PriceZero() (gas: 122774)
29+
ReservoirPriceOracleTest:testGetQuote_Inverse(uint256,uint256) (runs: 256, μ: 40049, ~: 40219)
30+
ReservoirPriceOracleTest:testGetQuote_MultipleHops() (gas: 118329)
31+
ReservoirPriceOracleTest:testGetQuote_MultipleHops_Inverse() (gas: 118555)
32+
ReservoirPriceOracleTest:testGetQuote_MultipleHops_PriceZero() (gas: 128906)
3333
ReservoirPriceOracleTest:testGetQuote_NoFallbackOracle() (gas: 20785)
3434
ReservoirPriceOracleTest:testGetQuote_PriceZero() (gas: 15919)
35-
ReservoirPriceOracleTest:testGetQuote_RandomizeAllParam_1HopRoute(uint256,uint256,address,address,uint8,uint8) (runs: 256, μ: 5229894, ~: 5229875)
36-
ReservoirPriceOracleTest:testGetQuote_RandomizeAllParam_2HopRoute(uint256,uint256,uint256,address,address,address,uint8,uint8,uint8) (runs: 256, μ: 10377448, ~: 10377624)
35+
ReservoirPriceOracleTest:testGetQuote_RandomizeAllParam_1HopRoute(uint256,uint256,address,address,uint8,uint8) (runs: 256, μ: 5007594, ~: 5013416)
36+
ReservoirPriceOracleTest:testGetQuote_RandomizeAllParam_2HopRoute(uint256,uint256,uint256,address,address,address,uint8,uint8,uint8) (runs: 256, μ: 9915122, ~: 9925381)
3737
ReservoirPriceOracleTest:testGetQuote_SameBaseQuote(uint256,address) (runs: 256, μ: 8971, ~: 8971)
3838
ReservoirPriceOracleTest:testGetQuote_UseFallback() (gas: 38209)
39-
ReservoirPriceOracleTest:testGetQuote_ZeroIn() (gas: 36674)
40-
ReservoirPriceOracleTest:testGetQuotes(uint256,uint256) (runs: 256, μ: 26348, ~: 26443)
39+
ReservoirPriceOracleTest:testGetQuote_ZeroIn() (gas: 40740)
40+
ReservoirPriceOracleTest:testGetQuotes(uint256,uint256) (runs: 256, μ: 26283, ~: 26391)
4141
ReservoirPriceOracleTest:testName() (gas: 9311)
4242
ReservoirPriceOracleTest:testPriceCache_Inverted() (gas: 22086)
4343
ReservoirPriceOracleTest:testSetFallbackOracle_NotOwner() (gas: 10928)
44-
ReservoirPriceOracleTest:testSetRoute() (gas: 61115)
45-
ReservoirPriceOracleTest:testSetRoute_2ndSlotClearedWhenReplacing3HopByShorterRoute() (gas: 167426)
46-
ReservoirPriceOracleTest:testSetRoute_InvalidDecimals() (gas: 763534)
47-
ReservoirPriceOracleTest:testSetRoute_InvalidRewardThreshold() (gas: 41610)
44+
ReservoirPriceOracleTest:testSetRoute() (gas: 65455)
45+
ReservoirPriceOracleTest:testSetRoute_2ndSlotClearedWhenReplacing3HopByShorterRoute() (gas: 176106)
46+
ReservoirPriceOracleTest:testSetRoute_InvalidDecimals() (gas: 636051)
47+
ReservoirPriceOracleTest:testSetRoute_InvalidRewardThreshold() (gas: 49950)
4848
ReservoirPriceOracleTest:testSetRoute_InvalidRewardThresholdLength() (gas: 18129)
4949
ReservoirPriceOracleTest:testSetRoute_InvalidRoute() (gas: 20221)
5050
ReservoirPriceOracleTest:testSetRoute_InvalidRouteLength() (gas: 19356)
51-
ReservoirPriceOracleTest:testSetRoute_MultipleHops() (gas: 201780)
51+
ReservoirPriceOracleTest:testSetRoute_MultipleHops() (gas: 210290)
5252
ReservoirPriceOracleTest:testSetRoute_NotSorted() (gas: 13074)
53-
ReservoirPriceOracleTest:testSetRoute_OverwriteExisting() (gas: 173710)
54-
ReservoirPriceOracleTest:testSetRoute_OverwriteExisting_UsingCompositeAsIntermediate() (gas: 114782)
55-
ReservoirPriceOracleTest:testSetRoute_ReplaceExistingCompositeWithSimple() (gas: 182717)
56-
ReservoirPriceOracleTest:testSetRoute_ReplaceExistingSimpleWithComposite() (gas: 103503)
53+
ReservoirPriceOracleTest:testSetRoute_OverwriteExisting() (gas: 182390)
54+
ReservoirPriceOracleTest:testSetRoute_OverwriteExisting_UsingCompositeAsIntermediate() (gas: 118952)
55+
ReservoirPriceOracleTest:testSetRoute_ReplaceExistingCompositeWithSimple() (gas: 191227)
56+
ReservoirPriceOracleTest:testSetRoute_ReplaceExistingSimpleWithComposite() (gas: 109843)
5757
ReservoirPriceOracleTest:testSetRoute_SameToken() (gas: 13020)
58-
ReservoirPriceOracleTest:testUndesignatePair() (gas: 30285)
58+
ReservoirPriceOracleTest:testUndesignatePair() (gas: 30302)
5959
ReservoirPriceOracleTest:testUndesignatePair_NotOwner() (gas: 15315)
60-
ReservoirPriceOracleTest:testUpdatePrice_AboveThresholdBelowMaxReward(uint256) (runs: 256, μ: 163101, ~: 163130)
61-
ReservoirPriceOracleTest:testUpdatePrice_BelowThreshold(uint256) (runs: 256, μ: 150522, ~: 150554)
62-
ReservoirPriceOracleTest:testUpdatePrice_BeyondMaxReward(uint256) (runs: 256, μ: 160453, ~: 160397)
63-
ReservoirPriceOracleTest:testUpdatePrice_FirstUpdate() (gas: 154049)
64-
ReservoirPriceOracleTest:testUpdatePrice_IntermediateRoutes() (gas: 11083988)
60+
ReservoirPriceOracleTest:testUpdatePrice_AboveThresholdBelowMaxReward(uint256) (runs: 256, μ: 159442, ~: 159468)
61+
ReservoirPriceOracleTest:testUpdatePrice_BelowThreshold(uint256) (runs: 256, μ: 146860, ~: 146892)
62+
ReservoirPriceOracleTest:testUpdatePrice_BeyondMaxReward(uint256) (runs: 256, μ: 156797, ~: 156735)
63+
ReservoirPriceOracleTest:testUpdatePrice_FirstUpdate() (gas: 150063)
64+
ReservoirPriceOracleTest:testUpdatePrice_IntermediateRoutes() (gas: 10573453)
6565
ReservoirPriceOracleTest:testUpdatePrice_NoPath() (gas: 15942)
66-
ReservoirPriceOracleTest:testUpdatePrice_PriceOutOfRange() (gas: 5374827)
67-
ReservoirPriceOracleTest:testUpdatePrice_RewardEligible_ContractNoReceive() (gas: 151245)
68-
ReservoirPriceOracleTest:testUpdatePrice_RewardEligible_InsufficientReward(uint256) (runs: 256, μ: 209556, ~: 209774)
69-
ReservoirPriceOracleTest:testUpdatePrice_RewardEligible_ZeroRecipient() (gas: 144902)
70-
ReservoirPriceOracleTest:testUpdatePrice_WriteToNonSimpleRoute() (gas: 503066)
66+
ReservoirPriceOracleTest:testUpdatePrice_PriceOutOfRange() (gas: 5119788)
67+
ReservoirPriceOracleTest:testUpdatePrice_RewardEligible_ContractNoReceive() (gas: 147583)
68+
ReservoirPriceOracleTest:testUpdatePrice_RewardEligible_InsufficientReward(uint256) (runs: 256, μ: 205402, ~: 205612)
69+
ReservoirPriceOracleTest:testUpdatePrice_RewardEligible_ZeroRecipient() (gas: 141240)
70+
ReservoirPriceOracleTest:testUpdatePrice_WriteToNonSimpleRoute() (gas: 501360)
7171
ReservoirPriceOracleTest:testUpdateRewardGasAmount() (gas: 19117)
7272
ReservoirPriceOracleTest:testUpdateRewardGasAmount_NotOwner() (gas: 10987)
73-
ReservoirPriceOracleTest:testUpdateTwapPeriod(uint256) (runs: 256, μ: 21709, ~: 21778)
74-
ReservoirPriceOracleTest:testUpdateTwapPeriod_InvalidTwapPeriod(uint256) (runs: 256, μ: 17843, ~: 18066)
75-
ReservoirPriceOracleTest:testValidatePair_NoDesignatedPair() (gas: 119868)
76-
ReservoirPriceOracleTest:testWritePriceCache(uint256) (runs: 256, μ: 30073, ~: 29833)
73+
ReservoirPriceOracleTest:testUpdateTwapPeriod(uint256) (runs: 256, μ: 21688, ~: 21778)
74+
ReservoirPriceOracleTest:testUpdateTwapPeriod_InvalidTwapPeriod(uint256) (runs: 256, μ: 17885, ~: 18066)
75+
ReservoirPriceOracleTest:testValidatePair_NoDesignatedPair() (gas: 119026)
76+
ReservoirPriceOracleTest:testWritePriceCache(uint256) (runs: 256, μ: 34262, ~: 34003)
7777
RoutesLibTest:testGetDecimalDifference() (gas: 3966)
7878
RoutesLibTest:testIsCompositeRoute() (gas: 4332)
7979
RoutesLibTest:testPackSimplePrice(int8,uint64,uint256) (runs: 256, μ: 8159, ~: 7915)

‎lib/openzeppelin-contracts‎

‎test/large/ReservoirPriceOracleLarge.t.sol‎

Lines changed: 5 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -30,25 +30,13 @@ contract ReservoirPriceOracleLargeTest is ReservoirPriceOracleTest {
3030
uint8 aTokenDDecimal
3131
) external {
3232
// assume
33-
vm.assume(
34-
aTokenAAddress.code.length == 0 && aTokenBAddress.code.length == 0 && aTokenCAddress.code.length == 0
35-
&& aTokenCAddress.code.length == 0
36-
);
37-
assumeNotPrecompile(aTokenAAddress);
38-
assumeNotPrecompile(aTokenBAddress);
39-
assumeNotPrecompile(aTokenCAddress);
40-
assumeNotPrecompile(aTokenDAddress);
41-
assumeNotZeroAddress(aTokenAAddress);
42-
assumeNotZeroAddress(aTokenBAddress);
43-
assumeNotZeroAddress(aTokenCAddress);
44-
assumeNotZeroAddress(aTokenDAddress);
45-
assumeNotForgeAddress(aTokenAAddress);
46-
assumeNotForgeAddress(aTokenBAddress);
47-
assumeNotForgeAddress(aTokenCAddress);
48-
assumeNotForgeAddress(aTokenDAddress);
33+
assumeUnusedAddress(aTokenAAddress);
34+
assumeUnusedAddress(aTokenBAddress);
35+
assumeUnusedAddress(aTokenCAddress);
36+
assumeUnusedAddress(aTokenDAddress);
4937
vm.assume(
5038
aTokenAAddress != aTokenBAddress && aTokenAAddress != aTokenCAddress && aTokenAAddress != aTokenDAddress
51-
&& aTokenBAddress != aTokenCAddress && aTokenBAddress != aTokenDAddress && aTokenBAddress != aTokenDAddress
39+
&& aTokenBAddress != aTokenCAddress && aTokenBAddress != aTokenDAddress && aTokenCAddress != aTokenDAddress
5240
);
5341
uint256 lPrice1 = bound(aPrice1, 1e12, 1e24);
5442
uint256 lPrice2 = bound(aPrice2, 1e12, 1e24);

‎test/unit/ReservoirPriceOracle.t.sol‎

Lines changed: 9 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -259,13 +259,9 @@ contract ReservoirPriceOracleTest is BaseTest {
259259
uint8 aTokenBDecimal
260260
) external {
261261
// assume
262-
vm.assume(aTokenAAddress.code.length == 0 && aTokenBAddress.code.length == 0);
263-
assumeNotPrecompile(aTokenAAddress);
264-
assumeNotPrecompile(aTokenBAddress);
265-
assumeNotZeroAddress(aTokenAAddress);
266-
assumeNotZeroAddress(aTokenBAddress);
267-
assumeNotForgeAddress(aTokenAAddress);
268-
assumeNotForgeAddress(aTokenBAddress);
262+
assumeUnusedAddress(aTokenAAddress);
263+
assumeUnusedAddress(aTokenBAddress);
264+
vm.assume(aTokenAAddress != aTokenBAddress);
269265
uint256 lPrice = bound(aPrice, 1, 1e36);
270266
uint256 lAmtIn = bound(aAmtIn, 0, 1_000_000_000);
271267
uint256 lTokenADecimal = bound(aTokenADecimal, 0, 18);
@@ -311,16 +307,12 @@ contract ReservoirPriceOracleTest is BaseTest {
311307
uint8 aTokenCDecimal
312308
) external {
313309
// assume
314-
vm.assume(aTokenAAddress.code.length == 0 && aTokenBAddress.code.length == 0 && aTokenCAddress.code.length == 0);
315-
assumeNotPrecompile(aTokenAAddress);
316-
assumeNotPrecompile(aTokenBAddress);
317-
assumeNotPrecompile(aTokenCAddress);
318-
assumeNotZeroAddress(aTokenAAddress);
319-
assumeNotZeroAddress(aTokenBAddress);
320-
assumeNotZeroAddress(aTokenCAddress);
321-
assumeNotForgeAddress(aTokenAAddress);
322-
assumeNotForgeAddress(aTokenBAddress);
323-
assumeNotForgeAddress(aTokenCAddress);
310+
assumeUnusedAddress(aTokenAAddress);
311+
assumeUnusedAddress(aTokenBAddress);
312+
assumeUnusedAddress(aTokenCAddress);
313+
vm.assume(aTokenAAddress != aTokenBAddress);
314+
vm.assume(aTokenAAddress != aTokenCAddress);
315+
vm.assume(aTokenBAddress != aTokenCAddress);
324316
uint256 lPrice1 = bound(aPrice1, 1e9, 1e25); // need to bound price within this range as a price below this will go to zero as during the mul and div of prices
325317
uint256 lPrice2 = bound(aPrice2, 1e9, 1e25);
326318
uint256 lAmtIn = bound(aAmtIn, 0, 1_000_000_000);

0 commit comments

Comments
 (0)