182 Commits

Author SHA1 Message Date
baa8ccb5dc fix swapped price accumulators 2020-01-02 10:27:45 -05:00
b8655fee9f add "to" parameter to relevant functions 2019-12-30 17:54:02 -05:00
623353e9ad make push syntax more explicit 2019-12-30 15:57:43 -05:00
ba29b46456 move fee from swap back to mint + burn 2019-12-30 15:36:25 -05:00
cdd379079d burn -> forfeit
burnFrom -> forfeitFrom
make -> mint
made -> burn
move -> swap

make deadline check >= insteand of >
2019-12-30 15:07:49 -05:00
27efee645f notLocked -> unlocked 2019-12-30 13:30:23 -05:00
e9e087c328 remove getTokens from the factory 2019-12-30 13:30:15 -05:00
d2ddbd95e8 note edge case 2019-12-20 15:26:04 -05:00
203795277e add istanbul support for testing environment 2019-12-20 14:26:52 -05:00
c5e9261036 bump to solc@0.5.15 2019-12-20 13:28:21 -05:00
3c8ce4e1cc fix fee on swap implementation 2019-12-20 13:20:21 -05:00
49882ab99b forfeit -> burn
mint -> make

burn -> made
2019-12-19 18:02:49 -05:00
5add082d4f use interface in the factory 2019-12-19 12:56:54 -05:00
8a7da15f24 tweak rate when fees are on 2019-12-19 12:30:24 -05:00
9e80c55338 try out fees on swap
rework admin/fee stuff in the factory
2019-12-19 10:40:26 -05:00
20ae6d1195 unsafeBurn{,from} -> forfeit{,From}
expiration -> deadline
2019-12-19 08:45:37 -05:00
c9d0ba6198 prefix burn/burnFrom in ERC20 with unsafe
fix tests for new contract code
2019-12-18 17:51:25 -05:00
580787051e change to more flexible variant
combine swap functions

name changes
2019-12-18 16:40:32 -05:00
8c6d9fb17d inline bool check 2019-12-16 12:19:42 -05:00
1487bd402c prettier if statements 2019-12-13 17:41:18 -05:00
5b15d59773 approveMeta -> permit
call factory for fee logic

fail on balances > max112

add skim

use reserves in burnLiquidity
2019-12-13 17:25:04 -05:00
f263dab9b5 add more tests 2019-12-13 14:39:09 -05:00
4c77c630fb bulk out fee implementation 2019-12-12 18:12:23 -05:00
4e4546d0a9 bump solc to 0.5.14
chainId implementation (commented out for now)

improve events

move safeTransfer in UniswapV2

tweak error messages
2019-12-12 14:52:15 -05:00
f128ef3bc9 tweak name 2019-12-11 16:32:49 -05:00
cb20aa4604 clean up naming 2019-12-11 15:19:28 -05:00
f71bceee3d fix some edge cases and burnLiquidity bug 2019-12-11 14:50:24 -05:00
8bdf549b98 improve fee logic, make clamping logic more robust 2019-12-11 14:36:55 -05:00
fbcd002ed5 add fee implementation 2019-12-11 10:42:15 -05:00
12b269d686 small tweaks 2019-12-09 16:24:59 -05:00
26f8f69618 add skeleton LiquidityMinted event 2019-12-09 13:04:52 -05:00
fd95caea17 squash errors 2019-12-09 02:33:18 -05:00
7fa81c9d6f initial (borked) fee implementation 2019-12-08 16:47:09 -05:00
401d8e1e51 fix tests 2019-12-08 16:11:44 -05:00
c42fa57ac6 tweak uniswap 2019-12-08 15:53:49 -05:00
127afca62f tweak math 2019-12-08 15:53:43 -05:00
f4ab1b2fe0 tweak erc20 2019-12-08 15:06:54 -05:00
d9dec32a8b version bumps 2019-12-08 14:52:19 -05:00
90dc9f39ab tweak factory api 2019-12-08 14:45:49 -05:00
19f3ff68c6 remove Pair struct from factory 2019-12-06 11:28:40 -05:00
61c14cdadd remove ragequit, some cleanup 2019-12-05 18:17:15 -05:00
b284b63118 don't pack prices as much 2019-12-05 13:28:23 -05:00
607b1c6e6e remove all structs and rename variables 2019-12-04 18:45:28 -05:00
f06361140c uint256 -> uint
use 256 in more places

break out separate functions
2019-12-04 17:08:38 -05:00
e88ba8b09c fix interface 2019-11-26 14:05:46 -05:00
73a7ff6813 Merge branch 'master' of https://github.com/Uniswap/uniswap-v2 2019-11-26 13:43:00 -05:00
da6ba92d92 clean up names and implementation of oracle stuff
update UQ104.104 copy

make safetransfer much clearer
2019-11-26 13:42:55 -05:00
bee51151c2 make oracke data public 2019-11-26 12:52:29 -05:00
a6970a3887 fix bugs 2019-11-26 12:15:54 -05:00
3bb8a6defb compact storing for blocknumber and oracle data 2019-11-25 17:49:04 -05:00