diff --git a/contracts/Factory/DPPFactory.sol b/contracts/Factory/DPPFactory.sol index 377e7eb..7c4d52d 100644 --- a/contracts/Factory/DPPFactory.sol +++ b/contracts/Factory/DPPFactory.sol @@ -167,7 +167,7 @@ contract DPPFactory is InitializableOwnable { // ============ View Functions ============ - function getPrivatePool(address baseToken, address quoteToken) + function getDODOPool(address baseToken, address quoteToken) external view returns (address[] memory pools) @@ -175,7 +175,7 @@ contract DPPFactory is InitializableOwnable { return _REGISTRY_[baseToken][quoteToken]; } - function getPrivatePoolBidirection(address token0, address token1) + function getDODOPoolBidirection(address token0, address token1) external view returns (address[] memory baseToken0Pool, address[] memory baseToken1Pool) @@ -183,7 +183,7 @@ contract DPPFactory is InitializableOwnable { return (_REGISTRY_[token0][token1], _REGISTRY_[token1][token0]); } - function getPrivatePoolByUser(address user) + function getDODOPoolByUser(address user) external view returns (address[] memory pools) diff --git a/contracts/Factory/DVMFactory.sol b/contracts/Factory/DVMFactory.sol index fccfcbe..c2d3e4c 100644 --- a/contracts/Factory/DVMFactory.sol +++ b/contracts/Factory/DVMFactory.sol @@ -142,7 +142,7 @@ contract DVMFactory is InitializableOwnable { // ============ View Functions ============ - function getVendingMachine(address baseToken, address quoteToken) + function getDODOPool(address baseToken, address quoteToken) external view returns (address[] memory machines) @@ -150,7 +150,7 @@ contract DVMFactory is InitializableOwnable { return _REGISTRY_[baseToken][quoteToken]; } - function getVendingMachineBidirection(address token0, address token1) + function getDODOPoolBidirection(address token0, address token1) external view returns (address[] memory baseToken0Machines, address[] memory baseToken1Machines) @@ -158,7 +158,7 @@ contract DVMFactory is InitializableOwnable { return (_REGISTRY_[token0][token1], _REGISTRY_[token1][token0]); } - function getVendingMachineByUser(address user) + function getDODOPoolByUser(address user) external view returns (address[] memory machines) diff --git a/contracts/SmartRoute/helper/DODOV2RouteHelper.sol b/contracts/SmartRoute/helper/DODOV2RouteHelper.sol index 4c0428c..c2ebab0 100644 --- a/contracts/SmartRoute/helper/DODOV2RouteHelper.sol +++ b/contracts/SmartRoute/helper/DODOV2RouteHelper.sol @@ -36,8 +36,8 @@ contract DODOV2RouteHelper { } 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 baseToken0DPP, address[] memory baseToken1DPP) = IDODOV2(_DPP_FACTORY_).getPrivatePoolBidirection(token0,token1); + (address[] memory baseToken0DVM, address[] memory baseToken1DVM) = IDODOV2(_DVM_FACTORY_).getDODOPoolBidirection(token0,token1); + (address[] memory baseToken0DPP, address[] memory baseToken1DPP) = IDODOV2(_DPP_FACTORY_).getDODOPoolBidirection(token0,token1); uint256 len = baseToken0DVM.length + baseToken1DVM.length + baseToken0DPP.length + baseToken1DPP.length; res = new PairDetail[](len); for(uint8 i = 0; i < len; i++) { diff --git a/contracts/SmartRoute/intf/IDODOV2.sol b/contracts/SmartRoute/intf/IDODOV2.sol index 4e9cea3..3038bab 100644 --- a/contracts/SmartRoute/intf/IDODOV2.sol +++ b/contracts/SmartRoute/intf/IDODOV2.sol @@ -34,6 +34,9 @@ interface IDODOV2 { 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 ======== function createDODOVendingMachine( @@ -47,7 +50,6 @@ interface IDODOV2 { 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 =========== @@ -75,7 +77,6 @@ interface IDODOV2 { uint256 minQuoteReserve ) external returns (bool); - function getPrivatePoolBidirection(address token0, address token1) external view returns (address[] memory baseToken0Pool, address[] memory baseToken1Pool); function _OWNER_() external returns (address); diff --git a/test/V2Proxy/proxy.dpp.test.ts b/test/V2Proxy/proxy.dpp.test.ts index 963c422..4c16500 100644 --- a/test/V2Proxy/proxy.dpp.test.ts +++ b/test/V2Proxy/proxy.dpp.test.ts @@ -119,7 +119,7 @@ describe("DODOProxyV2.0", () => { false, Math.floor(new Date().getTime() / 1000 + 60 * 10) ), 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( await ctx.DODO.methods.balanceOf(addrs[1]).call(), baseAmount diff --git a/test/V2Proxy/proxy.dvm.test.ts b/test/V2Proxy/proxy.dvm.test.ts index 0d3b93c..7c0e526 100644 --- a/test/V2Proxy/proxy.dvm.test.ts +++ b/test/V2Proxy/proxy.dvm.test.ts @@ -119,7 +119,7 @@ describe("DODOProxyV2.0", () => { false, Math.floor(new Date().getTime() / 1000 + 60 * 10) ), 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( await ctx.DODO.methods.balanceOf(addrs[1]).call(), baseAmount @@ -175,7 +175,7 @@ describe("DODOProxyV2.0", () => { // config.k, // Math.floor(new Date().getTime() / 1000 + 60 * 10) // ), 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( // await ctx.WETH.methods.balanceOf(addrs[1]).call(), // baseAmount diff --git a/truffle-test.sh b/truffle-test.sh index 24e566e..b3c15f4 100644 --- a/truffle-test.sh +++ b/truffle-test.sh @@ -1,5 +1,5 @@ #!/bin/bash -# truffle compile --all +truffle compile --all if [ "$1"x = "proxy-dpp"x ] then