diff --git a/contracts/DODOPrivatePool/impl/DPP.sol b/contracts/DODOPrivatePool/impl/DPP.sol index e3aa069..a53f4f7 100644 --- a/contracts/DODOPrivatePool/impl/DPP.sol +++ b/contracts/DODOPrivatePool/impl/DPP.sol @@ -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 } } diff --git a/contracts/DODOVendingMachine/impl/DVM.sol b/contracts/DODOVendingMachine/impl/DVM.sol index 7ae4b75..a47ea18 100644 --- a/contracts/DODOVendingMachine/impl/DVM.sol +++ b/contracts/DODOVendingMachine/impl/DVM.sol @@ -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"; } diff --git a/contracts/DODOVendingMachine/impl/DVMFunding.sol b/contracts/DODOVendingMachine/impl/DVMFunding.sol index 305bc3a..5629573 100644 --- a/contracts/DODOVendingMachine/impl/DVMFunding.sol +++ b/contracts/DODOVendingMachine/impl/DVMFunding.sol @@ -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); diff --git a/contracts/DODOVendingMachine/impl/DVMStorage.sol b/contracts/DODOVendingMachine/impl/DVMStorage.sol index 09dd951..1c269e3 100644 --- a/contracts/DODOVendingMachine/impl/DVMStorage.sol +++ b/contracts/DODOVendingMachine/impl/DVMStorage.sol @@ -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_; diff --git a/contracts/DODOVendingMachine/impl/DVMVault.sol b/contracts/DODOVendingMachine/impl/DVMVault.sol index 0b3407b..aec1b4e 100644 --- a/contracts/DODOVendingMachine/impl/DVMVault.sol +++ b/contracts/DODOVendingMachine/impl/DVMVault.sol @@ -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() } diff --git a/contracts/SmartRoute/DODOV2Proxy01.sol b/contracts/SmartRoute/DODOV2Proxy01.sol index 55423da..f5f02c2 100644 --- a/contracts/SmartRoute/DODOV2Proxy01.sol +++ b/contracts/SmartRoute/DODOV2Proxy01.sol @@ -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); diff --git a/contracts/SmartRoute/intf/IDODOV2.sol b/contracts/SmartRoute/intf/IDODOV2.sol index 9b720ea..1d57c03 100644 --- a/contracts/SmartRoute/intf/IDODOV2.sol +++ b/contracts/SmartRoute/intf/IDODOV2.sol @@ -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 =========== diff --git a/contracts/SmartRoute/intf/IDODOV2Proxy01.sol b/contracts/SmartRoute/intf/IDODOV2Proxy01.sol index 250226c..43a155c 100644 --- a/contracts/SmartRoute/intf/IDODOV2Proxy01.sol +++ b/contracts/SmartRoute/intf/IDODOV2Proxy01.sol @@ -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, diff --git a/package-lock.json b/package-lock.json index af6f651..ca7c341 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1291,6 +1291,14 @@ "resolved": "https://registry.npmjs.org/@types/es6-promisify/-/es6-promisify-6.0.0.tgz", "integrity": "sha512-w3eB2FfE60gHeUTWT65G/FsTlqOAl8qZeyDGxAniF4oS7T6acQ7uvtGKQlCIQNOGh6r21A/3mBASNzy8Tbx+hg==" }, + "@types/ethereumjs-abi": { + "version": "0.6.3", + "resolved": "https://registry.npmjs.org/@types/ethereumjs-abi/-/ethereumjs-abi-0.6.3.tgz", + "integrity": "sha512-DnHvqPkrJS5w4yZexTa5bdPNb8IyKPYciou0+zZCIg5fpzvGtyptTvshy0uZKzti2/k/markwjlxWRBWt7Mjuw==", + "requires": { + "@types/node": "*" + } + }, "@types/glob": { "version": "7.1.3", "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.1.3.tgz", @@ -3708,6 +3716,175 @@ } } }, + "ethjs": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/ethjs/-/ethjs-0.4.0.tgz", + "integrity": "sha512-UnQeRMpQ+JETN2FviexEskUwByid+eO8rybjPnk2DNUzjUn0VKNrUbiCAud7Es6otDFwjUeOS58vMZwkZxIIog==", + "requires": { + "bn.js": "4.11.6", + "ethjs-abi": "0.2.1", + "ethjs-contract": "0.2.3", + "ethjs-filter": "0.1.8", + "ethjs-provider-http": "0.1.6", + "ethjs-query": "0.3.8", + "ethjs-unit": "0.1.6", + "ethjs-util": "0.1.3", + "js-sha3": "0.5.5", + "number-to-bn": "1.7.0" + }, + "dependencies": { + "bn.js": { + "version": "4.11.6", + "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.6.tgz", + "integrity": "sha1-UzRK2xRhehP26N0s4okF0cC6MhU=" + }, + "ethjs-util": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/ethjs-util/-/ethjs-util-0.1.3.tgz", + "integrity": "sha1-39XqSkANxeQhqInK9H4IGtp4u1U=", + "requires": { + "is-hex-prefixed": "1.0.0", + "strip-hex-prefix": "1.0.0" + } + }, + "js-sha3": { + "version": "0.5.5", + "resolved": "https://registry.npmjs.org/js-sha3/-/js-sha3-0.5.5.tgz", + "integrity": "sha1-uvDA6MVK1ZA0R9+Wreekobynmko=" + } + } + }, + "ethjs-abi": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/ethjs-abi/-/ethjs-abi-0.2.1.tgz", + "integrity": "sha1-4KepOn6BFjqUR3utVu3lJKtt5TM=", + "requires": { + "bn.js": "4.11.6", + "js-sha3": "0.5.5", + "number-to-bn": "1.7.0" + }, + "dependencies": { + "bn.js": { + "version": "4.11.6", + "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.6.tgz", + "integrity": "sha1-UzRK2xRhehP26N0s4okF0cC6MhU=" + }, + "js-sha3": { + "version": "0.5.5", + "resolved": "https://registry.npmjs.org/js-sha3/-/js-sha3-0.5.5.tgz", + "integrity": "sha1-uvDA6MVK1ZA0R9+Wreekobynmko=" + } + } + }, + "ethjs-contract": { + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/ethjs-contract/-/ethjs-contract-0.2.3.tgz", + "integrity": "sha512-fKsHm57wxwHrZhVlD8AHU2lC2G3c1fmvoEz15BpqIkuGWiTbjuvrQo2Avc+3EQpSsTFWNdyxC0h1WKRcn5kkyQ==", + "requires": { + "babel-runtime": "^6.26.0", + "ethjs-abi": "0.2.0", + "ethjs-filter": "0.1.8", + "ethjs-util": "0.1.3", + "js-sha3": "0.5.5" + }, + "dependencies": { + "bn.js": { + "version": "4.11.6", + "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.6.tgz", + "integrity": "sha1-UzRK2xRhehP26N0s4okF0cC6MhU=" + }, + "ethjs-abi": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/ethjs-abi/-/ethjs-abi-0.2.0.tgz", + "integrity": "sha1-0+LCIQEVIPxJm3FoIDbBT8wvWyU=", + "requires": { + "bn.js": "4.11.6", + "js-sha3": "0.5.5", + "number-to-bn": "1.7.0" + } + }, + "ethjs-util": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/ethjs-util/-/ethjs-util-0.1.3.tgz", + "integrity": "sha1-39XqSkANxeQhqInK9H4IGtp4u1U=", + "requires": { + "is-hex-prefixed": "1.0.0", + "strip-hex-prefix": "1.0.0" + } + }, + "js-sha3": { + "version": "0.5.5", + "resolved": "https://registry.npmjs.org/js-sha3/-/js-sha3-0.5.5.tgz", + "integrity": "sha1-uvDA6MVK1ZA0R9+Wreekobynmko=" + } + } + }, + "ethjs-filter": { + "version": "0.1.8", + "resolved": "https://registry.npmjs.org/ethjs-filter/-/ethjs-filter-0.1.8.tgz", + "integrity": "sha512-qTDPskDL2UadHwjvM8A+WG9HwM4/FoSY3p3rMJORkHltYcAuiQZd2otzOYKcL5w2Q3sbAkW/E3yt/FPFL/AVXA==" + }, + "ethjs-format": { + "version": "0.2.7", + "resolved": "https://registry.npmjs.org/ethjs-format/-/ethjs-format-0.2.7.tgz", + "integrity": "sha512-uNYAi+r3/mvR3xYu2AfSXx5teP4ovy9z2FrRsblU+h2logsaIKZPi9V3bn3V7wuRcnG0HZ3QydgZuVaRo06C4Q==", + "requires": { + "bn.js": "4.11.6", + "ethjs-schema": "0.2.1", + "ethjs-util": "0.1.3", + "is-hex-prefixed": "1.0.0", + "number-to-bn": "1.7.0", + "strip-hex-prefix": "1.0.0" + }, + "dependencies": { + "bn.js": { + "version": "4.11.6", + "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.6.tgz", + "integrity": "sha1-UzRK2xRhehP26N0s4okF0cC6MhU=" + }, + "ethjs-util": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/ethjs-util/-/ethjs-util-0.1.3.tgz", + "integrity": "sha1-39XqSkANxeQhqInK9H4IGtp4u1U=", + "requires": { + "is-hex-prefixed": "1.0.0", + "strip-hex-prefix": "1.0.0" + } + } + } + }, + "ethjs-provider-http": { + "version": "0.1.6", + "resolved": "https://registry.npmjs.org/ethjs-provider-http/-/ethjs-provider-http-0.1.6.tgz", + "integrity": "sha1-HsXZtL4lfvHValALIqdBmF6IlCA=", + "requires": { + "xhr2": "0.1.3" + } + }, + "ethjs-query": { + "version": "0.3.8", + "resolved": "https://registry.npmjs.org/ethjs-query/-/ethjs-query-0.3.8.tgz", + "integrity": "sha512-/J5JydqrOzU8O7VBOwZKUWXxHDGr46VqNjBCJgBVNNda+tv7Xc8Y2uJc6aMHHVbeN3YOQ7YRElgIc0q1CI02lQ==", + "requires": { + "babel-runtime": "^6.26.0", + "ethjs-format": "0.2.7", + "ethjs-rpc": "0.2.0", + "promise-to-callback": "^1.0.0" + } + }, + "ethjs-rpc": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/ethjs-rpc/-/ethjs-rpc-0.2.0.tgz", + "integrity": "sha512-RINulkNZTKnj4R/cjYYtYMnFFaBcVALzbtEJEONrrka8IeoarNB9Jbzn+2rT00Cv8y/CxAI+GgY1d0/i2iQeOg==", + "requires": { + "promise-to-callback": "^1.0.0" + } + }, + "ethjs-schema": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/ethjs-schema/-/ethjs-schema-0.2.1.tgz", + "integrity": "sha512-DXd8lwNrhT9sjsh/Vd2Z+4pfyGxhc0POVnLBUfwk5udtdoBzADyq+sK39dcb48+ZU+2VgtwHxtGWnLnCfmfW5g==" + }, "ethjs-unit": { "version": "0.1.6", "resolved": "https://registry.npmjs.org/ethjs-unit/-/ethjs-unit-0.1.6.tgz", @@ -5621,8 +5798,7 @@ "is-fn": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-fn/-/is-fn-1.0.0.tgz", - "integrity": "sha1-lUPV3nvPWwiiLsiiC65uKG1RDYw=", - "dev": true + "integrity": "sha1-lUPV3nvPWwiiLsiiC65uKG1RDYw=" }, "is-fullwidth-code-point": { "version": "2.0.0", @@ -7345,7 +7521,6 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/promise-to-callback/-/promise-to-callback-1.0.0.tgz", "integrity": "sha1-XSp0kBC/tn2WNZj805YHRqaP7vc=", - "dev": true, "requires": { "is-fn": "^1.0.0", "set-immediate-shim": "^1.0.1" @@ -8223,8 +8398,7 @@ "set-immediate-shim": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz", - "integrity": "sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E=", - "dev": true + "integrity": "sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E=" }, "set-value": { "version": "2.0.1", @@ -10466,6 +10640,11 @@ "xhr-request": "^1.1.0" } }, + "xhr2": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/xhr2/-/xhr2-0.1.3.tgz", + "integrity": "sha1-y/xHWaabSoiOeM9PILBRA4dXvRE=" + }, "xhr2-cookies": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/xhr2-cookies/-/xhr2-cookies-1.1.0.tgz", diff --git a/package.json b/package.json index ce97aee..a88a522 100644 --- a/package.json +++ b/package.json @@ -26,6 +26,7 @@ "dependencies": { "@types/chai": "^4.2.11", "@types/es6-promisify": "^6.0.0", + "@types/ethereumjs-abi": "^0.6.3", "@types/mocha": "^7.0.2", "assert": "^2.0.0", "axios": "^0.20.0", @@ -36,7 +37,8 @@ "debug": "^4.1.1", "dotenv-flow": "^3.1.0", "es6-promisify": "^6.1.1", - "ethereumjs-util": "^7.0.2", + "ethereumjs-util": "^7.0.7", + "ethjs": "^0.4.0", "lodash": "^4.17.20", "mocha": "^7.2.0", "solc": "0.6.9", diff --git a/test/Proxy/proxy.dvm.test.ts b/test/Proxy/proxy.dvm.test.ts index a3c30cf..2a89fa2 100644 --- a/test/Proxy/proxy.dvm.test.ts +++ b/test/Proxy/proxy.dvm.test.ts @@ -6,13 +6,15 @@ */ // import * as assert from 'assert'; +const ethUtil = require('ethereumjs-util'); import BigNumber from "bignumber.js"; -import { decimalStr, mweiStr } from '../utils/Converter'; +import { decimalStr, MAX_UINT256, mweiStr } from '../utils/Converter'; import { logGas } from '../utils/Log'; import { ProxyContext, getProxyContext } from '../utils/ProxyContext'; import { assert } from 'chai'; import * as contracts from '../utils/Contracts'; import { Contract } from 'web3-eth-contract'; +import { SignHelper } from "../utils/SignHelper"; let lp: string; let project: string; @@ -25,6 +27,39 @@ let config = { i: decimalStr("100"), }; +//For Permit Init +let typedData = { + types: { + EIP712Domain: [ + { name: 'name', type: 'string' }, + { name: 'version', type: 'string' }, + { name: 'chainId', type: 'uint256' }, + { name: 'verifyingContract', type: 'address' }, + ], + Permit: [ + { name: 'owner', type: 'address' }, + { name: 'spender', type: 'address' }, + { name: 'value', type: 'uint256' }, + { name: 'nonce', type: 'uint256' }, + { name: 'deadline', type: 'uint256' }, + ] + }, + primaryType: 'Permit', + domain: { + name: '', + version: '1', + chainId: 1, + verifyingContract: '', + }, + message: { + owner: "", + spender: "", + value: MAX_UINT256, + nonce: 0, + deadline: 0 + } +}; + async function init(ctx: ProxyContext): Promise { lp = ctx.SpareAccounts[0]; project = ctx.SpareAccounts[1]; @@ -202,5 +237,146 @@ describe("DODOProxyV2.0", () => { assert.equal(a_dlp,"1000000000000000000"); }); + it("removeLiquidity", async () => { + var b_baseReserve = await DVM_DODO_USDT.methods._BASE_RESERVE_().call(); + var b_quoteReserve = await DVM_DODO_USDT.methods._QUOTE_RESERVE_().call(); + var b_dlp = await DVM_DODO_USDT.methods.balanceOf(project).call(); + var b_DODO = await ctx.DODO.methods.balanceOf(project).call(); + var b_USDT = await ctx.USDT.methods.balanceOf(project).call(); + assert.equal(b_baseReserve,decimalStr("100000")); + assert.equal(b_quoteReserve,mweiStr("30000")); + assert.equal(b_dlp,decimalStr("100000")); + assert.equal(b_DODO,decimalStr("900000")); + assert.equal(b_USDT,mweiStr("940000")); + await DVM_DODO_USDT.methods.approve(ctx.SmartApprove.options.address, MAX_UINT256).send(ctx.sendParam(project)); + await logGas(await ctx.DODOProxy.methods.removeDVMLiquidity( + dvm_DODO_USDT, + project, + decimalStr("100"), + decimalStr("0"), + mweiStr("0"), + 0, + Math.floor(new Date().getTime() / 1000 + 60 * 10) + ),ctx.sendParam(project),"removeLiquidity"); + var a_baseReserve = await DVM_DODO_USDT.methods._BASE_RESERVE_().call(); + var a_quoteReserve = await DVM_DODO_USDT.methods._QUOTE_RESERVE_().call(); + var a_dlp = await DVM_DODO_USDT.methods.balanceOf(project).call(); + var a_DODO = await ctx.DODO.methods.balanceOf(project).call(); + var a_USDT = await ctx.USDT.methods.balanceOf(project).call(); + assert.equal(a_baseReserve, decimalStr("99900")); + assert.equal(a_quoteReserve, mweiStr("29970")); + assert.equal(a_dlp, decimalStr("99900")); + assert.equal(a_DODO, decimalStr("900100")); + assert.equal(a_USDT, mweiStr("940030")); + }); + + it("removeLiquidity - ETH", async () => { + var b_baseReserve = await DVM_WETH_USDT.methods._BASE_RESERVE_().call(); + var b_quoteReserve = await DVM_WETH_USDT.methods._QUOTE_RESERVE_().call(); + var b_dlp = await DVM_WETH_USDT.methods.balanceOf(project).call(); + var b_WETH = await ctx.WETH.methods.balanceOf(project).call(); + var b_USDT = await ctx.USDT.methods.balanceOf(project).call(); + var b_ETH = await ctx.Web3.eth.getBalance(project); + assert.equal(b_baseReserve, decimalStr("5")); + assert.equal(b_quoteReserve, mweiStr("30000")); + assert.equal(b_dlp, decimalStr("5")); + assert.equal(b_WETH, decimalStr("0")); + assert.equal(b_USDT, mweiStr("940000")); + await DVM_WETH_USDT.methods.approve(ctx.SmartApprove.options.address, MAX_UINT256).send(ctx.sendParam(project)); + var tx = await logGas(await ctx.DODOProxy.methods.removeDVMLiquidity( + dvm_WETH_USDT, + project, + decimalStr("1"), + decimalStr("0"), + mweiStr("0"), + 1, + Math.floor(new Date().getTime() / 1000 + 60 * 10) + ), ctx.sendParam(project), "removeLiquidity - ETH"); + var a_baseReserve = await DVM_WETH_USDT.methods._BASE_RESERVE_().call(); + var a_quoteReserve = await DVM_WETH_USDT.methods._QUOTE_RESERVE_().call(); + var a_dlp = await DVM_WETH_USDT.methods.balanceOf(project).call(); + var a_WETH = await ctx.WETH.methods.balanceOf(project).call(); + var a_USDT = await ctx.USDT.methods.balanceOf(project).call(); + var a_ETH = await ctx.Web3.eth.getBalance(project); + // console.log("a_baseReserve:" + a_baseReserve + " a_quoteReserve:" + a_quoteReserve + " a_dlp:" + a_dlp + " a_WETH:" + a_WETH + " a_USDT:" + a_USDT); + assert.equal(a_baseReserve, decimalStr("4")); + assert.equal(a_quoteReserve, mweiStr("24000")); + assert.equal(a_dlp, decimalStr("4")); + assert.equal(a_WETH, decimalStr("0")); + assert.equal(a_USDT, mweiStr("946000")); + console.log("b_ETH:", b_ETH); + console.log("a_ETH:", a_ETH); + assert.equal(new BigNumber(b_ETH).isGreaterThan(new BigNumber(a_ETH).minus(decimalStr("1"))), true); + }); + + + it("removeLiquidity - permit", async () => { + var b_baseReserve = await DVM_DODO_USDT.methods._BASE_RESERVE_().call(); + var b_quoteReserve = await DVM_DODO_USDT.methods._QUOTE_RESERVE_().call(); + var b_dlp = await DVM_DODO_USDT.methods.balanceOf(project).call(); + var b_DODO = await ctx.DODO.methods.balanceOf(project).call(); + var b_USDT = await ctx.USDT.methods.balanceOf(project).call(); + assert.equal(b_baseReserve, decimalStr("100000")); + assert.equal(b_quoteReserve, mweiStr("30000")); + assert.equal(b_dlp, decimalStr("100000")); + assert.equal(b_DODO, decimalStr("900000")); + assert.equal(b_USDT, mweiStr("940000")); + + var DOMAIN_SEPARATOR = await DVM_DODO_USDT.methods.DOMAIN_SEPARATOR().call(); + // var name = await DVM_DODO_USDT.methods.name().call(); + // typedData.domain.name = ctx.Web3.utils.sha3(name); + // typedData.domain.version = ctx.Web3.utils.sha3('1'); + // typedData.domain.chainId = await ctx.Web3.eth.getChainId(); + // typedData.domain.verifyingContract = dvm_DODO_USDT; + typedData.message.owner = project; + typedData.message.spender = ctx.SmartApprove.options.address; + var nonceStr = await DVM_DODO_USDT.methods.nonces(project).call(); + typedData.message.nonce = parseInt(nonceStr); + typedData.message.deadline = Math.floor(new Date().getTime() / 1000 + 60 * 10); + var resHash = new SignHelper().signHash(DOMAIN_SEPARATOR,typedData.message); + var sig = await ctx.Web3.eth.sign('0x' + resHash.toString('hex'), project); + // let r = sig.slice(0, 66) + // let s = '0x' + sig.slice(66, 130) + // let v = '0x1c' + const signRes = ethUtil.fromRpcSig(sig); + const prefix = Buffer.from("\x19Ethereum Signed Message:\n"); + const prefixedMsg = ethUtil.keccak256( + Buffer.concat([prefix, Buffer.from(String(resHash.length)), resHash]) + ); + console.log("add-prefix-degist:", "0x" + prefixedMsg.toString('hex')); + var pubKey = ethUtil.ecrecover(prefixedMsg, signRes.v,signRes.r,signRes.s) + // var pubKey = ethUtil.ecrecover(resHash, Buffer.from(v), Buffer.from(r), Buffer.from(s)) + var addrBuf = ethUtil.pubToAddress(pubKey); + console.log("project:" + project); + console.log("addr-web3-recover:" + ethUtil.bufferToHex(addrBuf)); + // var tx = await logGas(await DVM_DODO_USDT.methods.permit(project, typedData.message.spender, typedData.message.value, typedData.message.deadline, signRes.v, signRes.r, signRes.s), ctx.sendParam(project), "perimit test"); + // console.log("addr-sol-recover:" + tx.events['TestAddr'].returnValues['addr']); + // console.log("sol-domain:" + tx.events['TestAddr'].returnValues['domain']); + // console.log("sol-msg:" + tx.events['TestAddr'].returnValues['message']); + // console.log("sol-digest:" + tx.events['TestAddr'].returnValues['digest']); + // await logGas(await ctx.DODOProxy.methods.removeDVMLiquidityWithPermit( + // dvm_DODO_USDT, + // project, + // decimalStr("100"), + // decimalStr("0"), + // mweiStr("0"), + // 0, + // typedData.message.deadline, + // true, + // signRes.v, signRes.r, signRes.s + // ), ctx.sendParam(project), "removeLiquidity perimit"); + // var a_baseReserve = await DVM_DODO_USDT.methods._BASE_RESERVE_().call(); + // var a_quoteReserve = await DVM_DODO_USDT.methods._QUOTE_RESERVE_().call(); + // var a_dlp = await DVM_DODO_USDT.methods.balanceOf(project).call(); + // var a_DODO = await ctx.DODO.methods.balanceOf(project).call(); + // var a_USDT = await ctx.USDT.methods.balanceOf(project).call(); + // console.log("a_baseReserve:" + a_baseReserve + " a_quoteReserve:" + a_quoteReserve + " a_dlp:" + a_dlp + " a_DODO:" + a_DODO + " a_USDT:" + a_USDT); + // assert.equal(a_baseReserve, decimalStr("99900")); + // assert.equal(a_quoteReserve, mweiStr("29970")); + // assert.equal(a_dlp, decimalStr("99900")); + // assert.equal(a_DODO, decimalStr("900100")); + // assert.equal(a_USDT, mweiStr("940030")); + }); + }); }); diff --git a/test/utils/SignHelper.ts b/test/utils/SignHelper.ts new file mode 100644 index 0000000..6701a69 --- /dev/null +++ b/test/utils/SignHelper.ts @@ -0,0 +1,114 @@ +const ethUtil = require('ethereumjs-util'); +const abi = require('ethereumjs-abi'); + +export class SignHelper { + + private typedData = { + types: { + EIP712Domain: [ + { name: 'name', type: 'string' }, + { name: 'version', type: 'string' }, + { name: 'chainId', type: 'uint256' }, + { name: 'verifyingContract', type: 'address' }, + ], + Permit: [ + { name: 'owner', type: 'address' }, + { name: 'spender', type: 'address' }, + { name: 'value', type: 'uint256' }, + { name: 'nonce', type: 'uint256' }, + { name: 'deadline', type: 'uint256' }, + ] + }, + primaryType: 'Permit', + }; + + private types = this.typedData.types; + + // Recursively finds all the dependencies of a type + private dependencies(primaryType, found = []) { + if (found.includes(primaryType)) { + return found; + } + if (this.types[primaryType] === undefined) { + return found; + } + found.push(primaryType); + for (let field of this.types[primaryType]) { + for (let dep of this.dependencies(field.type, found)) { + if (!found.includes(dep)) { + found.push(dep); + } + } + } + return found; + } + + private encodeType(primaryType): Buffer { + // Get dependencies primary first, then alphabetical + let deps = this.dependencies(primaryType); + deps = deps.filter(t => t != primaryType); + deps = [primaryType].concat(deps.sort()); + + // Format as a string with fields + let result = ''; + for (let type of deps) { + result += `${type}(${this.types[type].map(({ name, type }) => `${type} ${name}`).join(',')})`; + } + return Buffer.from(result); + } + + private typeHash(primaryType) { + return ethUtil.keccak256(this.encodeType(primaryType)); + } + + private encodeData(primaryType, data):Buffer { + let encTypes = []; + let encValues = []; + // Add typehash + encTypes.push('bytes32'); + encValues.push(this.typeHash(primaryType)); + + // Add field contents + for (let field of this.types[primaryType]) { + let value = data[field.name]; + // console.log("type:" + field.type); + // console.log("value:" + value); + // encTypes.push(field.type); + // encValues.push(value); + if (field.type == 'string' || field.type == 'bytes') { + encTypes.push('bytes32'); + value = ethUtil.keccak256(Buffer.from(value)); + encValues.push(value); + } else if (this.types[field.type] !== undefined) { + encTypes.push('bytes32'); + value = ethUtil.keccak256(this.encodeData(field.type, value)); + encValues.push(value); + } else if (field.type.lastIndexOf(']') === field.type.length - 1) { + throw 'TODO: Arrays currently unimplemented in encodeData'; + } else { + encTypes.push(field.type); + encValues.push(value); + } + } + + return abi.rawEncode(encTypes, encValues); + } + + private structHash(primaryType, data) { + return ethUtil.keccak256(this.encodeData(primaryType, data)); + } + + public signHash(domain: string, message: any) { + var digest = ethUtil.keccak256( + Buffer.concat([ + Buffer.from('1901', 'hex'), + Buffer.from(domain), + // this.structHash('EIP712Domain', domain), + this.structHash(this.typedData.primaryType, message), + ]), + ); + console.log("digest:", "0x" + digest.toString("hex")); + return digest; + } +} +