254 Commits

Author SHA1 Message Date
d53d6de4ef add todo comments
don't hardcode decimals

don't make burns + transfers exclusive

simplify contract names

refactor factory
2019-10-23 18:18:18 -04:00
1175598e42 rework erc20
start to standardize syntax

4 spaces/tab

add implementation reference links

improve tests
2019-10-22 14:56:34 -04:00
3df2dbbae9 add circleci status badge
[skip ci]
2019-10-22 11:42:59 -04:00
f5c196350f add prettier
test in typescript

add GPL license

pin solc version

add CI
2019-10-22 11:38:01 -04:00
9c4b7cc1da Merge pull request #7 from Uniswap/dev
Dev
2019-10-21 19:08:49 -04:00
c2e415ea15 Merge pull request #6 from Uniswap/dan-dev
Add TWAP accumulator and wrapper
2019-10-21 19:08:08 -04:00
3baacaa6c8 small fixes and notes 2019-10-21 19:07:53 -04:00
7a07593551 remove ETH contracts 2019-10-21 18:45:28 -04:00
5fd97de4f1 fixes 2019-10-03 14:00:17 -07:00
db2c1cba0a add wrapper 2019-10-03 00:12:29 -07:00
691cfe2888 add require statements 2019-10-02 15:39:58 -07:00
10f48a6675 tweak 2019-10-02 15:25:24 -07:00
78adbf91c6 tweaks 2019-10-02 15:17:14 -07:00
6dc7342ff3 add twap accumulator 2019-10-02 15:06:10 -07:00
d1a352e447 update removeLiquidity 2019-10-02 11:54:02 -07:00
175caf4d19 make getInputPrice internal 2019-10-02 11:32:46 -07:00
3512a8af16 fix spelling on reentrancyLock 2019-10-02 11:28:12 -07:00
8f0507302d remove unnecessary checks 2019-10-02 11:25:03 -07:00
d47ffd5ec6 add recipient arg 2019-10-02 11:20:56 -07:00
e2c72b3246 refactor to keep stack small enough 2019-10-02 11:13:46 -07:00
afac21fc00 wip 2019-10-02 11:09:38 -07:00
da0b31bb1f remove redundant checks 2019-10-02 10:47:41 -07:00
844a47570c add Math library; change initial liquidity to geometric mean 2019-10-02 10:33:02 -07:00
cd6855ec97 Merge pull request #4 from Uniswap/trackReserves
contracts: track reserves in ERC20-ERC20 exchange and remove transferFrom
2019-10-02 11:22:25 -04:00
76a825b65a minor updates 2019-10-02 05:17:27 -07:00
1b2a28927c remove external getInputPrice 2019-10-02 04:55:31 -07:00
fe37136aaa update removeLiquidity 2019-10-01 17:50:47 -07:00
e7877b887c update addLiquidity 2019-10-01 17:45:49 -07:00
efff3cae04 refactor 2019-10-01 16:21:55 -07:00
a46b6630a7 switch to use currentOutputReserve 2019-10-01 15:52:32 -07:00
04b994380d contracts: track reserves in ERC20 and remove transferFrom 2019-10-01 13:20:19 -07:00
7bf29e9bdc contracts: split swapInput into two functions
This refactors the ERC20-ERC20 contract to split swapInput into two public functions, with the shared logic in a single private function. This reduces the amount of branching, and is likely to make further changes (such as caching reserve balances and recording accumulator values for the oracle) easier.
2019-10-01 12:17:13 -07:00
c791c27aee declare swap function before it is called 2019-10-01 11:13:44 -07:00
f30a65d6da fix recipient argument 2019-10-01 10:46:43 -07:00
55f999a531 add semicolon 2019-10-01 10:45:44 -07:00
52e2971afc contracts: split swapInput into two functions 2019-10-01 10:35:36 -07:00
9ea8b3a5d4 Merge pull request #2 from Uniswap/dropSwapOutput
contracts: drop swapOutput
2019-10-01 11:47:13 -04:00
524d17b282 drop getOutputPrice 2019-09-30 19:49:37 -07:00
346c642604 contracts: drop swapOutput 2019-09-25 18:02:26 -07:00
8c104c2ecc contracts: fix assignment bug
This fixes an apparent bug in the ERC20-ERC20 exchange contract, in which two methods use the equality operator == instead of the assignment operator =.
2019-09-25 17:51:37 -07:00
893e16d68e fix bug 2019-09-25 17:14:03 -07:00
e74a5fbc54 refactor 2019-09-25 17:58:30 -04:00
d1525383e2 fixes 2019-09-24 17:20:00 -04:00
31c1eb693c simplify contract 2019-09-20 16:17:17 -04:00
5216582fc0 fix bugs 2019-09-20 13:06:34 -04:00
8e9ffb19b9 finish ERC20/ERC20 2019-09-12 19:00:13 -04:00
188255c697 update 2019-09-12 16:45:09 -04:00
6272d96b44 rename 2019-09-12 15:20:25 -04:00
3a44db7163 fixes 2019-09-03 10:57:46 -04:00
9688ca2937 Update README.md 2019-08-29 17:48:14 -04:00