Commit Graph

28 Commits

Author SHA1 Message Date
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
d6958dfec8 add README.md 2019-08-29 16:26:59 -04:00
0e800be171 fix bug 2019-08-29 16:15:17 -04:00
59d19b2962 finish initial contracts 2019-08-29 16:10:44 -04:00
36a59fb592 basic setup 2019-08-28 16:31:10 -04:00