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

add permit

Browse Source
This commit is contained in:
owen05
2020-11-29 23:40:19 +08:00
parent d90e031a30
commit 7290f73634
12 changed files with 602 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
contracts/DODOPrivatePool/impl/DPP.sol
View File

@@ -44,6 +44,6 @@ contract DPP is DPPTrader {
// ============ Version Control ============
function version() external pure returns (uint256) {
return 100; // 1.0.0
return 1100; // DPP - 1.0.0
}
}

18
contracts/DODOVendingMachine/impl/DVM.sol
View File

@@ -53,6 +53,23 @@ contract DVM is DVMTrader, DVMFunding {
name = string(abi.encodePacked(suffix, connect, addressToShortString(address(this))));
symbol = "DLP";
decimals = _BASE_TOKEN_.decimals();
// ============================== Permit ====================================
uint256 chainId;
assembly {
chainId := chainid()
}
DOMAIN_SEPARATOR = keccak256(
abi.encode(
// keccak256('EIP712Domain(string name,string version,uint256 chainId,address verifyingContract)'),
0x8b73c3c69bb8fe3d512ecc4cf759cc79239f7b179b0ffacaa9a75d522b39400f,
keccak256(bytes(name)),
keccak256(bytes('1')),
chainId,
address(this)
)
);
// ==========================================================================
}
function addressToShortString(address _addr) public pure returns (string memory) {
@@ -68,7 +85,6 @@ contract DVM is DVMTrader, DVMFunding {
}
// ============ Version Control ============
function version() external pure returns (string memory) {
return "DVM 1.0.0";
}

7
contracts/DODOVendingMachine/impl/DVMFunding.sol
View File

@@ -67,14 +67,15 @@ contract DVMFunding is DVMVault {
address to,
uint256 baseMinAmount,
uint256 quoteMinAmount,
bytes calldata data
bytes calldata data,
uint256 deadline
) external preventReentrant returns (uint256 baseAmount, uint256 quoteAmount) {
require(deadline >= block.timestamp, 'DODOV2 DVMFUNDING: EXPIRED');
require(shareAmount <= _SHARES_[msg.sender], "DLP_NOT_ENOUGH");
uint256 baseBalance = _BASE_TOKEN_.balanceOf(address(this));
uint256 quoteBalance = _QUOTE_TOKEN_.balanceOf(address(this));
uint256 totalShares = totalSupply;
require(shareAmount <= _SHARES_[msg.sender], "DLP_NOT_ENOUGH");
baseAmount = baseBalance.mul(shareAmount).div(totalShares);
quoteAmount = quoteBalance.mul(shareAmount).div(totalShares);

8
contracts/DODOVendingMachine/impl/DVMStorage.sol
View File

@@ -49,6 +49,14 @@ contract DVMStorage is InitializableOwnable, ReentrancyGuard {
mapping(address => uint256) internal _SHARES_;
mapping(address => mapping(address => uint256)) internal _ALLOWED_;
// ================= Permit ======================
bytes32 public DOMAIN_SEPARATOR;
// keccak256("Permit(address owner,address spender,uint256 value,uint256 nonce,uint256 deadline)");
bytes32 public constant PERMIT_TYPEHASH = 0x6e71edae12b1b97f4d1f60370fef10105fa2faae0126114a169c64845d6126c9;
mapping(address => uint256) public nonces;
// ===============================================
// ============ Variables for Pricing ============
IFeeRateModel public _LP_FEE_RATE_MODEL_;

24
contracts/DODOVendingMachine/impl/DVMVault.sol
View File

@@ -117,11 +117,15 @@ contract DVMVault is DVMStorage {
* @param amount The amount of tokens to be spent.
*/
function approve(address spender, uint256 amount) public returns (bool) {
_ALLOWED_[msg.sender][spender] = amount;
emit Approval(msg.sender, spender, amount);
_approve(msg.sender, spender, amount);
return true;
}
function _approve(address owner, address spender, uint256 amount) private {
_ALLOWED_[owner][spender] = amount;
emit Approval(owner, spender, amount);
}
/**
* @dev Function to check the amount of tokens that an owner _ALLOWED_ to a spender.
* @param owner address The address which owns the funds.
@@ -146,5 +150,21 @@ contract DVMVault is DVMStorage {
emit Transfer(user, address(0), value);
}
// ============================ Permit ======================================
function permit(address owner, address spender, uint256 value, uint256 deadline, uint8 v, bytes32 r, bytes32 s) external {
require(deadline >= block.timestamp, 'DODO_DVM_LP: EXPIRED');
bytes32 digest = keccak256(
abi.encodePacked(
'\x19\x01',
DOMAIN_SEPARATOR,
keccak256(abi.encode(PERMIT_TYPEHASH, owner, spender, value, nonces[owner]++, deadline))
)
);
address recoveredAddress = ecrecover(digest, v, r, s);
require(recoveredAddress != address(0) && recoveredAddress == owner, 'DODO_DVM_LP: INVALID_SIGNATURE');
_approve(owner, spender, value);
}
// ===========================================================================
// function approveAndCall()
}

46
contracts/SmartRoute/DODOV2Proxy01.sol
View File

@@ -169,7 +169,7 @@ contract DODOV2Proxy01 is IDODOV2Proxy01 {
);
require(
baseAdjustedInAmount >= baseMinAmount && quoteAdjustedInAmount >= quoteMinAmount,
"DODOV2Proxy01: deposit amount is not enough"
'DODOV2Proxy01: deposit amount is not enough'
);
address _dvm = DVMAddress;
@@ -179,6 +179,46 @@ contract DODOV2Proxy01 is IDODOV2Proxy01 {
(shares, , ) = IDODOV2(_dvm).buyShares(to);
}
function removeDVMLiquidity(
address DVMAddress,
address payable to,
uint256 sharesAmount,
uint256 baseMinOutAmount,
uint256 quoteMinOutAmount,
uint8 flag, // 0 -ERC20, 1 - baseOutETH, 2 - quoteOutETH
uint256 deadline
) public virtual override judgeExpired(deadline) returns (uint256 baseOutAmount, uint256 quoteOutAmount) {
_deposit(msg.sender,DVMAddress,DVMAddress,sharesAmount,false);
if(flag == 0)
(baseOutAmount,quoteOutAmount) = IDODOV2(DVMAddress).sellShares(to);
else
(baseOutAmount,quoteOutAmount) = IDODOV2(DVMAddress).sellShares(address(this));
require(baseOutAmount >= baseMinOutAmount && quoteOutAmount >= quoteMinOutAmount, 'DODOV2Proxy01: Return Amount is not enough');
if(flag != 0){
_withdraw(to, IDODOV2(DVMAddress)._BASE_TOKEN_(), baseOutAmount,flag == 1);
_withdraw(to, IDODOV2(DVMAddress)._QUOTE_TOKEN_(), quoteOutAmount, flag == 2);
}
}
// ================ Permit ======================
function removeDVMLiquidityWithPermit(
address DVMAddress,
address payable to,
uint256 sharesAmount,
uint256 baseMinOutAmount,
uint256 quoteMinOutAmount,
uint8 flag, // 0 -ERC20, 1 - baseOutETH, 2 - quoteOutETH
uint256 deadline,
bool approveMax, uint8 v, bytes32 r, bytes32 s
) external virtual override returns (uint256 baseOutAmount, uint256 quoteOutAmount) {
uint256 value = approveMax ? uint256(-1) : sharesAmount;
IDODOV2(DVMAddress).permit(msg.sender, dodoApprove, value, deadline, v, r, s);
(baseOutAmount,quoteOutAmount) = removeDVMLiquidity(DVMAddress,to,sharesAmount,baseMinOutAmount,quoteMinOutAmount,flag,deadline);
}
// ============================================
function createDODOPrivatePool(
address baseToken,
address quoteToken,
@@ -439,7 +479,7 @@ contract DODOV2Proxy01 is IDODOV2Proxy01 {
}
function _withdraw(
address to,
address payable to,
address token,
uint256 amount,
bool isETH
@@ -447,7 +487,7 @@ contract DODOV2Proxy01 is IDODOV2Proxy01 {
if (isETH) {
if (amount > 0) {
IWETH(_WETH_).withdraw(amount);
msg.sender.transfer(amount);
to.transfer(amount);
}
} else {
SafeERC20.safeTransfer(IERC20(token), to, amount);

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

@@ -36,9 +36,13 @@ interface IDODOV2 {
uint256 k
) external returns (address newVendingMachine);
// ============= permit =================
function permit(address owner, address spender, uint value, uint deadline, uint8 v, bytes32 r, bytes32 s) external;
// ======================================
function buyShares(address to) external returns (uint256,uint256,uint256);
function sellShares(address to, uint256 amount, bytes calldata data) external returns (uint256,uint256);
function sellShares(address to) external returns (uint256,uint256);
//========== DODOPrivatePool ===========

24
contracts/SmartRoute/intf/IDODOV2Proxy01.sol
View File

@@ -82,6 +82,30 @@ interface IDODOV2Proxy01 {
uint256 quoteAdjustedInAmount
);
function removeDVMLiquidity(
address DVMAddress,
address payable to,
uint256 sharesAmount,
uint256 baseMinOutAmount,
uint256 quoteMinOutAmount,
uint8 flag, // 0 -ERC20, 1 - baseOutETH, 2 - quoteOutETH
uint256 deadline
) external returns (uint256 baseOutAmount, uint256 quoteOutAmount);
// ==================== Permit ================================
function removeDVMLiquidityWithPermit(
address DVMAddress,
address payable to,
uint256 sharesAmount,
uint256 baseMinOutAmount,
uint256 quoteMinOutAmount,
uint8 flag, // 0 -ERC20, 1 - baseOutETH, 2 - quoteOutETH
uint256 deadline,
bool approveMax, uint8 v, bytes32 r, bytes32 s
) external returns (uint256 baseOutAmount, uint256 quoteOutAmount);
// ==============================================================
function createDODOPrivatePool(
address baseToken,
address quoteToken,