Skip to content
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

update DSPProxy #45

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

update DSPProxy #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
543fa3d
add gspfactory; update dspproxy
Skyewwww Aug 9, 2024
e73d917
fix gspfactory and dspproxy
Skyewwww Aug 13, 2024
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
198 changes: 198 additions & 0 deletions contracts/Factory/GSPFactory.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,198 @@
/*

Copyright 2020 DODO ZOO.
SPDX-License-Identifier: Apache-2.0

*/

pragma solidity 0.6.9;

import {InitializableOwnable} from "../lib/InitializableOwnable.sol";
import {ICloneFactory} from "../lib/CloneFactory.sol";

interface IGSP {
function init(
address maintainer,
address admin,
address baseTokenAddress,
address quoteTokenAddress,
uint256 lpFeeRate,
uint256 mtFeeRate,
uint256 i,
uint256 k,
bool isOpenTWAP
) external;

function _BASE_TOKEN_() external view returns (address);

function _QUOTE_TOKEN_() external view returns (address);

function _I_() external view returns (uint256);

function _MT_FEE_RATE_MODEL_() external view returns (address); // Useless, just for compatibility

function getVaultReserve() external view returns (uint256 baseReserve, uint256 quoteReserve);

function getUserFeeRate(address user) external view returns (uint256 lpFeeRate, uint256 mtFeeRate);

function getMtFeeTotal() external view returns (uint256 mtFeeBase, uint256 mtFeeQuote);

function sellBase(address to) external returns (uint256);

function sellQuote(address to) external returns (uint256);

function buyShares(address to) external returns (uint256 shares, uint256 baseInput, uint256 quoteInput);

function sellShares(uint256 shareAmount, address to, uint256 baseMinAmount, uint256 quoteMinAmount, bytes calldata data, uint256 deadline) external returns (uint256 baseAmount, uint256 quoteAmount);
}

interface IGSPFactory {
function createDODOGasSavingPool(
address admin,
address baseToken,
address quoteToken,
uint256 lpFeeRate,
uint256 mtFeeRate,
uint256 i,
uint256 k,
bool isOpenTWAP
) external returns (address newGasSavingPool);
}

/**
* @title DODO GasSavingPool Factory
* @author DODO Breeder
*
* @notice Create And Register GSP Pools
*/
contract GSPFactory is InitializableOwnable {
// ============ Templates ============

address public immutable _CLONE_FACTORY_;
address public _DEFAULT_MAINTAINER_;
address public _GSP_TEMPLATE_;

// ============ Registry ============

// base -> quote -> GSP address list
mapping(address => mapping(address => address[])) public _REGISTRY_;
// creator -> GSP address list
mapping(address => address[]) public _USER_REGISTRY_;

// ============ Events ============

event NewGSP(address baseToken, address quoteToken, address creator, address GSP);

event RemoveGSP(address GSP);

// ============ Functions ============

constructor(
address cloneFactory,
address GSPTemplate,
address defaultMaintainer
) public {
_CLONE_FACTORY_ = cloneFactory;
_GSP_TEMPLATE_ = GSPTemplate;
_DEFAULT_MAINTAINER_ = defaultMaintainer;
}

function createDODOGasSavingPool(
address admin,
address baseToken,
address quoteToken,
uint256 lpFeeRate,
uint256 mtFeeRate,
uint256 i,
uint256 k,
bool isOpenTWAP
) external returns (address newGasSavingPool) {
newGasSavingPool = ICloneFactory(_CLONE_FACTORY_).clone(_GSP_TEMPLATE_);
{
IGSP(newGasSavingPool).init(
_DEFAULT_MAINTAINER_,
admin,
baseToken,
quoteToken,
lpFeeRate,
mtFeeRate,
i,
k,
isOpenTWAP
);
}
_REGISTRY_[baseToken][quoteToken].push(newGasSavingPool);
_USER_REGISTRY_[tx.origin].push(newGasSavingPool);
emit NewGSP(baseToken, quoteToken, tx.origin, newGasSavingPool);
}

// ============ Admin Operation Functions ============

function updateGSPTemplate(address _newGSPTemplate) external onlyOwner {
_GSP_TEMPLATE_ = _newGSPTemplate;
}

function updateDefaultMaintainer(address _newMaintainer) external onlyOwner {
_DEFAULT_MAINTAINER_ = _newMaintainer;
}

function addPoolByAdmin(
address creator,
address baseToken,
address quoteToken,
address pool
) external onlyOwner {
_REGISTRY_[baseToken][quoteToken].push(pool);
_USER_REGISTRY_[creator].push(pool);
emit NewGSP(baseToken, quoteToken, creator, pool);
}

function removePoolByAdmin(
address creator,
address baseToken,
address quoteToken,
address pool
) external onlyOwner {
address[] memory registryList = _REGISTRY_[baseToken][quoteToken];
for (uint256 i = 0; i < registryList.length; i++) {
if (registryList[i] == pool) {
registryList[i] = registryList[registryList.length - 1];
break;
}
}
_REGISTRY_[baseToken][quoteToken] = registryList;
_REGISTRY_[baseToken][quoteToken].pop();
address[] memory userRegistryList = _USER_REGISTRY_[creator];
for (uint256 i = 0; i < userRegistryList.length; i++) {
if (userRegistryList[i] == pool) {
userRegistryList[i] = userRegistryList[userRegistryList.length - 1];
break;
}
}
_USER_REGISTRY_[creator] = userRegistryList;
_USER_REGISTRY_[creator].pop();
emit RemoveGSP(pool);
}

// ============ View Functions ============

function getDODOPool(address baseToken, address quoteToken)
external
view
returns (address[] memory machines)
{
return _REGISTRY_[baseToken][quoteToken];
}

function getDODOPoolBidirection(address token0, address token1)
external
view
returns (address[] memory baseToken0Machines, address[] memory baseToken1Machines)
{
return (_REGISTRY_[token0][token1], _REGISTRY_[token1][token0]);
}

function getDODOPoolByUser(address user) external view returns (address[] memory machines) {
return _USER_REGISTRY_[user];
}
}
60 changes: 60 additions & 0 deletions contracts/SmartRoute/proxies/DODODspProxy.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ import {DecimalMath} from "../../lib/DecimalMath.sol";
import {ReentrancyGuard} from "../../lib/ReentrancyGuard.sol";
import {IDSP} from "../../DODOStablePool/intf/IDSP.sol";
import {IDSPFactory} from "../../Factory/DSPFactory.sol";
import {IGSP} from "../../Factory/GSPFactory.sol";
import {IGSPFactory} from "../../Factory/GSPFactory.sol";

/**
* @title DODODspProxy
Expand All @@ -32,6 +34,7 @@ contract DODODspProxy is ReentrancyGuard {
address public immutable _WETH_;
address public immutable _DODO_APPROVE_PROXY_;
address public immutable _DSP_FACTORY_;
address public immutable _GSP_FACTORY_;

// ============ Modifiers ============

Expand All @@ -46,14 +49,71 @@ contract DODODspProxy is ReentrancyGuard {

constructor(
address dspFactory,
address gspFactory,
address payable weth,
address dodoApproveProxy
) public {
_DSP_FACTORY_ = dspFactory;
_GSP_FACTORY_ = gspFactory;
_WETH_ = weth;
_DODO_APPROVE_PROXY_ = dodoApproveProxy;
}

// ============ GSP Functions (create & add liquidity) ============

function createDODOGasSavingPair(
address admin,
address baseToken,
address quoteToken,
uint256 lpFeeRate,
uint256 mtFeeRate,
uint256 i,
uint256 k,
bool isOpenTWAP,
uint256 deadLine
)
external
preventReentrant
judgeExpired(deadLine)
returns (address newGasSavingPair, uint256 shares)
{
{
address _baseToken = baseToken == _ETH_ADDRESS_ ? _WETH_ : baseToken;
address _quoteToken = quoteToken == _ETH_ADDRESS_ ? _WETH_ : quoteToken;
newGasSavingPair = IGSPFactory(_GSP_FACTORY_).createDODOGasSavingPool(
admin,
_baseToken,
_quoteToken,
lpFeeRate,
mtFeeRate,
i,
k,
isOpenTWAP
);
}

{
address _baseToken = baseToken;
address _quoteToken = quoteToken;
_deposit(
msg.sender,
newGasSavingPair,
_baseToken,
IERC20(_baseToken).balanceOf(msg.sender),
_baseToken == _ETH_ADDRESS_
);
_deposit(
msg.sender,
newGasSavingPair,
_quoteToken,
IERC20(_quoteToken).balanceOf(msg.sender),
_quoteToken == _ETH_ADDRESS_
);
}

(shares, , ) = IGSP(newGasSavingPair).buyShares(msg.sender);
}

// ============ DSP Functions (create & add liquidity) ============

function createDODOStablePair(
Expand Down