Skip to content
This repository has been archived by the owner on Jan 13, 2023. It is now read-only.

[BAC-119] Use Uniswap V2 and Curve in DAI-USD oracle #498

Merged
merged 13 commits into from
Aug 28, 2020
Merged

[BAC-119] Use Uniswap V2 and Curve in DAI-USD oracle #498

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
afe6ce9
Use Uniswap V2 for Dai oracle
Kenadia Aug 27, 2020
dff8745
Replace Oasis with Curve in DAI oracle
Kenadia Aug 27, 2020
d093333
Fix lint
Kenadia Aug 27, 2020
7c2c5d1
clean up oasis -> curve
Kenadia Aug 27, 2020
bc34953
Fix uint128 -> int128 in curve interface
Kenadia Aug 27, 2020
26b407a
Fix reciprocal and decimals
Kenadia Aug 27, 2020
2a31bbe
Use Uniswap instead of Maker in DAI oracle
Kenadia Aug 28, 2020
cb85f8e
Address CR
Kenadia Aug 28, 2020
32625aa
Use get_dy() instead of get_dy_underlying()
Kenadia Aug 28, 2020
248d935
Fix lint
Kenadia Aug 28, 2020
2ca1608
CR: TestUniswapV2Pair2 inherit from TestUniswapV2Pair
Kenadia Aug 28, 2020
1c0d231
Fix comments
Kenadia Aug 28, 2020
d6e56f7
CR: Add comments
Kenadia Aug 28, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 22 additions & 6 deletions __tests__/modules/TestContracts.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,9 @@ import { TestSimpleCallee } from '../../build/testing_wrappers/TestSimpleCallee'
import { TestExchangeWrapper } from '../../build/testing_wrappers/TestExchangeWrapper';
import { TestPriceOracle } from '../../build/testing_wrappers/TestPriceOracle';
import { TestMakerOracle } from '../../build/testing_wrappers/TestMakerOracle';
import { TestOasisDex } from '../../build/testing_wrappers/TestOasisDex';
import { TestCurve } from '../../build/testing_wrappers/TestCurve';
import { TestUniswapV2Pair } from '../../build/testing_wrappers/TestUniswapV2Pair';
import { TestUniswapV2Pair2 } from '../../build/testing_wrappers/TestUniswapV2Pair2';
import { TestInterestSetter } from '../../build/testing_wrappers/TestInterestSetter';
import { TestPolynomialInterestSetter }
from '../../build/testing_wrappers/TestPolynomialInterestSetter';
Expand All @@ -50,7 +52,9 @@ import testSimpleCalleeJson from '../../build/testing_contracts/TestSimpleCallee
import testExchangeWrapperJson from '../../build/testing_contracts/TestExchangeWrapper.json';
import testPriceOracleJson from '../../build/testing_contracts/TestPriceOracle.json';
import testMakerOracleJson from '../../build/testing_contracts/TestMakerOracle.json';
import testOasisDexJson from '../../build/testing_contracts/TestOasisDex.json';
import testCurveJson from '../../build/testing_contracts/TestCurve.json';
import testUniswapV2PairJson from '../../build/testing_contracts/TestUniswapV2Pair.json';
import testUniswapV2Pair2Json from '../../build/testing_contracts/TestUniswapV2Pair2.json';
import testPolynomialInterestSetterJson
from '../../build/testing_contracts/TestPolynomialInterestSetter.json';
import testDoubleExponentInterestSetterJson
Expand Down Expand Up @@ -79,7 +83,9 @@ export class TestContracts extends Contracts {
public testExchangeWrapper: TestExchangeWrapper;
public testPriceOracle: TestPriceOracle;
public testMakerOracle: TestMakerOracle;
public testOasisDex: TestOasisDex;
public testCurve: TestCurve;
public testUniswapV2Pair: TestUniswapV2Pair;
public testUniswapV2Pair2: TestUniswapV2Pair2;
public testPolynomialInterestSetter: TestPolynomialInterestSetter;
public testDoubleExponentInterestSetter: TestDoubleExponentInterestSetter;
public testInterestSetter: TestInterestSetter;
Expand Down Expand Up @@ -109,7 +115,13 @@ export class TestContracts extends Contracts {
testExchangeWrapperJson.abi) as TestExchangeWrapper;
this.testPriceOracle = new this.web3.eth.Contract(testPriceOracleJson.abi) as TestPriceOracle;
this.testMakerOracle = new this.web3.eth.Contract(testMakerOracleJson.abi) as TestMakerOracle;
this.testOasisDex = new this.web3.eth.Contract(testOasisDexJson.abi) as TestOasisDex;
this.testCurve = new this.web3.eth.Contract(testCurveJson.abi) as TestCurve;
this.testUniswapV2Pair = new this.web3.eth.Contract(
testUniswapV2PairJson.abi,
) as TestUniswapV2Pair;
this.testUniswapV2Pair2 = new this.web3.eth.Contract(
testUniswapV2Pair2Json.abi,
) as TestUniswapV2Pair2;
this.testInterestSetter = new this.web3.eth.Contract(
testInterestSetterJson.abi) as TestInterestSetter;
this.testPolynomialInterestSetter = new this.web3.eth.Contract(
Expand Down Expand Up @@ -149,7 +161,9 @@ export class TestContracts extends Contracts {
{ contract: this.testExchangeWrapper, json: testExchangeWrapperJson },
{ contract: this.testPriceOracle, json: testPriceOracleJson },
{ contract: this.testMakerOracle, json: testMakerOracleJson },
{ contract: this.testOasisDex, json: testOasisDexJson },
{ contract: this.testCurve, json: testCurveJson },
{ contract: this.testUniswapV2Pair, json: testUniswapV2PairJson },
{ contract: this.testUniswapV2Pair2, json: testUniswapV2Pair2Json },
{ contract: this.testPolynomialInterestSetter, json: testPolynomialInterestSetterJson },
{ contract: this.testDoubleExponentInterestSetter,
json: testDoubleExponentInterestSetterJson },
Expand Down Expand Up @@ -189,7 +203,9 @@ export class TestContracts extends Contracts {
this.testExchangeWrapper.options.from = account;
this.testPriceOracle.options.from = account;
this.testMakerOracle.options.from = account;
this.testOasisDex.options.from = account;
this.testCurve.options.from = account;
this.testUniswapV2Pair.options.from = account;
this.testUniswapV2Pair2.options.from = account;
this.testPolynomialInterestSetter.options.from = account;
this.testDoubleExponentInterestSetter.options.from = account;
this.testInterestSetter.options.from = account;
Expand Down
Loading