Oasis 1.1 #192

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merged

gbalabasquer merged 34 commits into master from kk/oasis-forever

Jan 28, 2021

Collaborator

krzkaczor commented Jan 4, 2021 •

edited

Loading

Summary

This PR removes the expiration date from OasisDEX and makes all necessary tweaks to make it run forever!

Changes:

Support non-compliant erc20 tokens
Remove expiring market
Automatically set dust limit using uniswap as price oracle
- Let anyone set dust limit
- Decide what to do when token doesn't exist
- Prevent setting dust for DAI
Allow anyone to cancel dust trades

krzkaczor added 4 commits

December 11, 2020 14:05


          Support non-compliant erc20 tokens


          Remove expiring market to make oasis run forever

b21794a


          Set dust limit using Uniswap as price oracle


          Extract UniswapSimplePriceOracle

f97118d

krzkaczor force-pushed the kk/oasis-forever branch from ee70168 to f97118d Compare

January 8, 2021 12:07


          Prevent indirect calls to setMinSell

e4aa0e4

krzkaczor changed the title ~~Oasis Forever [wip]~~ Oasis Forever


          Allow canceling dust offers by anyone

b48764a

krzkaczor marked this pull request as ready for review

January 8, 2021 15:28

krzkaczor commented

View reviewed changes

src/matching_market.sol Show resolved Hide resolved

maciejka reviewed

View reviewed changes

src/matching_market.sol Show resolved Hide resolved

src/matching_market.sol Show resolved Hide resolved

krzkaczor added 2 commits

January 11, 2021 14:55


          Allow canceling dust offers buy_amt side

07ac214


          Cancel when order becomes dust after dust based on buy_gem

9c48749

gbalabasquer reviewed

View reviewed changes

src/matching_market.sol Outdated Show resolved Hide resolved

gbalabasquer reviewed

View reviewed changes

src/matching_market.sol Outdated Show resolved Hide resolved

gbalabasquer reviewed

View reviewed changes

src/matching_market.sol Outdated Show resolved Hide resolved

gbalabasquer reviewed

View reviewed changes

src/matching_market.sol Show resolved Hide resolved

gbalabasquer reviewed

View reviewed changes

scripts/run-live-tests.sh Outdated Show resolved Hide resolved

gbalabasquer reviewed

View reviewed changes

scripts/run-tests.sh Outdated Show resolved Hide resolved

gbalabasquer reviewed

View reviewed changes

src/uniswap/UniswapLibrary.sol Outdated Show resolved Hide resolved

gbalabasquer reviewed

View reviewed changes

src/matching_market.sol Show resolved Hide resolved

gbalabasquer reviewed

View reviewed changes

src/matching_market.sol Outdated Show resolved Hide resolved

gbalabasquer reviewed

View reviewed changes

src/matching_market.sol Outdated Show resolved Hide resolved

gbalabasquer reviewed

View reviewed changes

src/matching_market.t.sol Outdated Show resolved Hide resolved

krzkaczor added 6 commits

January 14, 2021 12:50


          Get rid of return values for setMinSell

d785210


          Add missing new lines

fdf8e47


          Remove matchingEnabled switch

b316272


          Remove ds-auth and buyEnabled switch

dbf0424


          Remove unnecessary note

20df398


          Rename DAI and daiDustLimit to something more abstract

4f7ec7d


          Introduce PriceOracle interface

95d16e5

krzkaczor changed the title ~~Oasis Forever~~ Oasis 1.1

gbalabasquer reviewed

View reviewed changes

src/matching_market.sol Outdated Show resolved Hide resolved

gbalabasquer reviewed

View reviewed changes

src/matching_market.sol Outdated Show resolved Hide resolved

gbalabasquer added 8 commits

January 18, 2021 08:24


          Compile with solc 0.5.12

4c337fb


          Make new variables public

ebfee4a


          Fix tests for newer dapptools

43f1bea


          dapp uninstall ds-note

f063470


          Remove DSNote

dd2cd61


          Remove PriceOracle interface file

e634a3a


          Fix error message

c8da41b


          Don't run mainnet forked test on run-tests.sh

92b4263

gbalabasquer reviewed

View reviewed changes

src/matching_market.sol Outdated Show resolved Hide resolved

README.md Outdated Show resolved Hide resolved

gbalabasquer reviewed

View reviewed changes

src/matching_market.t.sol Outdated Show resolved Hide resolved

gbalabasquer added 5 commits

January 18, 2021 10:28


          Minor changes

8ab6970


          Simplify uniswap files

6bbb475


          Fix safe transfer so it doesn't allow to pass a EOA

a109d0f


          Remove commented tests

ea581fd


          Remove comments

3bdb08f

gbalabasquer approved these changes

View reviewed changes

Collaborator

gbalabasquer left a comment

LGTM. When this is going to get merged please use the "Squash and merge" option.

krzkaczor and others added 6 commits

January 18, 2021 16:58


          Add license to UniswapLibrary.sol

1b4154f


          Add SPDX license comments

b3ccfac


          When checking for dust check only pay_amt, remove some outdated comment

092cf9a


          Remove ( )

f7e0058


          Merge pull request #197 from daifoundation/kk/final-fixes

23dca2b

When checking for dust check only pay_amt, remove some outdated comment


          Changes on license header + minor comment change on can_cancel

0682d62

gbalabasquer merged commit 3b02ac6 into master

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet