dexorder/contract
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Tim Olson
2023-11-01 18:05:32 -04:00
parent 4759effae2 e10c3c7093
commit 139449f3e9
2 changed files with 28 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
test/TestFullMath.py
View File

@@ -7,4 +7,16 @@ MAXneg = -MAXpos-1
print("MAXpos:", hex(MAXpos)) print("MAXpos:", hex(MAXpos))
print("MAXneg:", hex(MAXneg)) print("MAXneg:", hex(MAXneg))
# https://github.com/Uniswap/v3-core/issues/586
a = 316922101631557355182318461781248010879680643072; # ~2^157
b = 2694519998095207227803175883740; # ~2^101
d = 79232019085396855395509160680691688; # ~2^116
expected = 10777876804631170754249523106393912452806121; # ~2^143
r = a * b // d
print("Expected issue 586", expected)
assert r == expected
pass pass

22
test/TestFullMath.sol
View File

@@ -63,15 +63,25 @@ contract TestFullMath is Test {
q = FullMath.mulDiv(MAXneg, MinusOne, MinusOne); q = FullMath.mulDiv(MAXneg, MinusOne, MinusOne);
require(q == MAXneg, "case 4f failed"); require(q == MAXneg, "case 4f failed");
// Case 5
// https://github.com/Uniswap/v3-core/issues/586
uint256 a;
uint256 b;
uint256 d;
uint256 expected;
a = 316922101631557355182318461781248010879680643072; // ~2^157
b = 2694519998095207227803175883740; // ~2^101
d = 79232019085396855395509160680691688; // ~2^116
expected = 10777876804631170754249523106393912452806121; // ~2^143
require (FullMath.mulDiv(a, b, d) == expected, "Case 5 failed");
// Case 10 -- various exponents // Case 10 -- various exponents
uint256 aExp; uint256 aExp;
uint256 bExp; uint256 bExp;
uint256 dExp; uint256 dExp;
uint256 a;
uint256 b;
uint256 d;
uint256 qExpected;
aExp = 255; aExp = 255;
bExp = 255; bExp = 255;
@@ -80,10 +90,10 @@ contract TestFullMath is Test {
a = 2**aExp; a = 2**aExp;
b = 2**bExp; b = 2**bExp;
d = 2**dExp; d = 2**dExp;
qExpected = 2**(aExp+bExp-dExp); expected = 2**(aExp+bExp-dExp);
q = FullMath.mulDiv(a,b,d); // DUT q = FullMath.mulDiv(a,b,d); // DUT
require(q == qExpected, "case 10 failed"); // check require(q == expected, "case 10 failed"); // check
} }
} }