d-bis/dodo-contractV2
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

change factory name

Browse Source
This commit is contained in:
owen05
2021-01-19 18:08:27 +08:00
parent 8b683af08f
commit 2c9446c94b
7 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
contracts/Factory/DPPFactory.sol
View File

@@ -167,7 +167,7 @@ contract DPPFactory is InitializableOwnable {
// ============ View Functions ============ // ============ View Functions ============
function getPrivatePool(address baseToken, address quoteToken) function getDODOPool(address baseToken, address quoteToken)
external external
view view
returns (address[] memory pools) returns (address[] memory pools)
@@ -175,7 +175,7 @@ contract DPPFactory is InitializableOwnable {
return _REGISTRY_[baseToken][quoteToken]; return _REGISTRY_[baseToken][quoteToken];
} }
function getPrivatePoolBidirection(address token0, address token1) function getDODOPoolBidirection(address token0, address token1)
external external
view view
returns (address[] memory baseToken0Pool, address[] memory baseToken1Pool) returns (address[] memory baseToken0Pool, address[] memory baseToken1Pool)
@@ -183,7 +183,7 @@ contract DPPFactory is InitializableOwnable {
return (_REGISTRY_[token0][token1], _REGISTRY_[token1][token0]); return (_REGISTRY_[token0][token1], _REGISTRY_[token1][token0]);
} }
function getPrivatePoolByUser(address user) function getDODOPoolByUser(address user)
external external
view view
returns (address[] memory pools) returns (address[] memory pools)

6
contracts/Factory/DVMFactory.sol
View File

@@ -142,7 +142,7 @@ contract DVMFactory is InitializableOwnable {
// ============ View Functions ============ // ============ View Functions ============
function getVendingMachine(address baseToken, address quoteToken) function getDODOPool(address baseToken, address quoteToken)
external external
view view
returns (address[] memory machines) returns (address[] memory machines)
@@ -150,7 +150,7 @@ contract DVMFactory is InitializableOwnable {
return _REGISTRY_[baseToken][quoteToken]; return _REGISTRY_[baseToken][quoteToken];
} }
function getVendingMachineBidirection(address token0, address token1) function getDODOPoolBidirection(address token0, address token1)
external external
view view
returns (address[] memory baseToken0Machines, address[] memory baseToken1Machines) returns (address[] memory baseToken0Machines, address[] memory baseToken1Machines)
@@ -158,7 +158,7 @@ contract DVMFactory is InitializableOwnable {
return (_REGISTRY_[token0][token1], _REGISTRY_[token1][token0]); return (_REGISTRY_[token0][token1], _REGISTRY_[token1][token0]);
} }
function getVendingMachineByUser(address user) function getDODOPoolByUser(address user)
external external
view view
returns (address[] memory machines) returns (address[] memory machines)

4
contracts/SmartRoute/helper/DODOV2RouteHelper.sol
View File

@@ -36,8 +36,8 @@ contract DODOV2RouteHelper {
} }
function getPairDetail(address token0,address token1,address userAddr) external view returns (PairDetail[] memory res) { function getPairDetail(address token0,address token1,address userAddr) external view returns (PairDetail[] memory res) {
(address[] memory baseToken0DVM, address[] memory baseToken1DVM) = IDODOV2(_DVM_FACTORY_).getVendingMachineBidirection(token0,token1); (address[] memory baseToken0DVM, address[] memory baseToken1DVM) = IDODOV2(_DVM_FACTORY_).getDODOPoolBidirection(token0,token1);
(address[] memory baseToken0DPP, address[] memory baseToken1DPP) = IDODOV2(_DPP_FACTORY_).getPrivatePoolBidirection(token0,token1); (address[] memory baseToken0DPP, address[] memory baseToken1DPP) = IDODOV2(_DPP_FACTORY_).getDODOPoolBidirection(token0,token1);
uint256 len = baseToken0DVM.length + baseToken1DVM.length + baseToken0DPP.length + baseToken1DPP.length; uint256 len = baseToken0DVM.length + baseToken1DVM.length + baseToken0DPP.length + baseToken1DPP.length;
res = new PairDetail[](len); res = new PairDetail[](len);
for(uint8 i = 0; i < len; i++) { for(uint8 i = 0; i < len; i++) {

5
contracts/SmartRoute/intf/IDODOV2.sol
View File

@@ -34,6 +34,9 @@ interface IDODOV2 {
function getUserFeeRate(address user) external view returns (uint256 lpFeeRate, uint256 mtFeeRate); function getUserFeeRate(address user) external view returns (uint256 lpFeeRate, uint256 mtFeeRate);
function getDODOPoolBidirection(address token0, address token1) external view returns (address[] memory, address[] memory);
//========== DODOVendingMachine ======== //========== DODOVendingMachine ========
function createDODOVendingMachine( function createDODOVendingMachine(
@@ -47,7 +50,6 @@ interface IDODOV2 {
function buyShares(address to) external returns (uint256,uint256,uint256); function buyShares(address to) external returns (uint256,uint256,uint256);
function getVendingMachineBidirection(address token0, address token1) external view returns (address[] memory baseToken0Machines, address[] memory baseToken1Machines);
//========== DODOPrivatePool =========== //========== DODOPrivatePool ===========
@@ -75,7 +77,6 @@ interface IDODOV2 {
uint256 minQuoteReserve uint256 minQuoteReserve
) external returns (bool); ) external returns (bool);
function getPrivatePoolBidirection(address token0, address token1) external view returns (address[] memory baseToken0Pool, address[] memory baseToken1Pool);
function _OWNER_() external returns (address); function _OWNER_() external returns (address);

2
test/V2Proxy/proxy.dpp.test.ts
View File

@@ -119,7 +119,7 @@ describe("DODOProxyV2.0", () => {
false, false,
Math.floor(new Date().getTime() / 1000 + 60 * 10) Math.floor(new Date().getTime() / 1000 + 60 * 10)
), ctx.sendParam(project), "createDPP"); ), ctx.sendParam(project), "createDPP");
var addrs = await ctx.DPPFactory.methods.getPrivatePool(baseToken, quoteToken).call(); var addrs = await ctx.DPPFactory.methods.getDODOPool(baseToken, quoteToken).call();
assert.equal( assert.equal(
await ctx.DODO.methods.balanceOf(addrs[1]).call(), await ctx.DODO.methods.balanceOf(addrs[1]).call(),
baseAmount baseAmount

4
test/V2Proxy/proxy.dvm.test.ts
View File

@@ -119,7 +119,7 @@ describe("DODOProxyV2.0", () => {
false, false,
Math.floor(new Date().getTime() / 1000 + 60 * 10) Math.floor(new Date().getTime() / 1000 + 60 * 10)
), ctx.sendParam(project), "createDVM"); ), ctx.sendParam(project), "createDVM");
var addrs = await ctx.DVMFactory.methods.getVendingMachine(baseToken, quoteToken).call(); var addrs = await ctx.DVMFactory.methods.getDODOPool(baseToken, quoteToken).call();
assert.equal( assert.equal(
await ctx.DODO.methods.balanceOf(addrs[1]).call(), await ctx.DODO.methods.balanceOf(addrs[1]).call(),
baseAmount baseAmount
@@ -175,7 +175,7 @@ describe("DODOProxyV2.0", () => {
// config.k, // config.k,
// Math.floor(new Date().getTime() / 1000 + 60 * 10) // Math.floor(new Date().getTime() / 1000 + 60 * 10)
// ), ctx.sendParam(project, '5'), "createDVM - Wrap ETH"); // ), ctx.sendParam(project, '5'), "createDVM - Wrap ETH");
// var addrs = await ctx.DVMFactory.methods.getVendingMachine(ctx.WETH.options.address, quoteToken).call(); // var addrs = await ctx.DVMFactory.methods.getDODOPool(ctx.WETH.options.address, quoteToken).call();
// assert.equal( // assert.equal(
// await ctx.WETH.methods.balanceOf(addrs[1]).call(), // await ctx.WETH.methods.balanceOf(addrs[1]).call(),
// baseAmount // baseAmount

2
truffle-test.sh
View File

@@ -1,5 +1,5 @@
#!/bin/bash #!/bin/bash
# truffle compile --all truffle compile --all
if [ "$1"x = "proxy-dpp"x ] if [ "$1"x = "proxy-dpp"x ]
then then