unchange FeeRateModel
This commit is contained in:
@@ -14,9 +14,9 @@ import {ICP} from "../CrowdPooling/intf/ICP.sol";
|
|||||||
import {SafeMath} from "../lib/SafeMath.sol";
|
import {SafeMath} from "../lib/SafeMath.sol";
|
||||||
import {IERC20} from "../intf/IERC20.sol";
|
import {IERC20} from "../intf/IERC20.sol";
|
||||||
import {DecimalMath} from "../lib/DecimalMath.sol";
|
import {DecimalMath} from "../lib/DecimalMath.sol";
|
||||||
|
import {FeeRateModel} from "../lib/FeeRateModel.sol";
|
||||||
|
|
||||||
interface IFeeRateModel {
|
interface IFeeRateImpl {
|
||||||
function getFeeRate(address trader) external view returns (uint256);
|
|
||||||
function addCpPoolInfo(address cpPool, address quoteToken, int globalQuota, address feeAddr, address quotaAddr) external;
|
function addCpPoolInfo(address cpPool, address quoteToken, int globalQuota, address feeAddr, address quotaAddr) external;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -131,7 +131,8 @@ contract CrowdPoolingFactory is InitializableOwnable {
|
|||||||
switches
|
switches
|
||||||
);
|
);
|
||||||
|
|
||||||
IFeeRateModel(_DEFAULT_MT_FEE_RATE_MODEL_).addCpPoolInfo(cpAddress, tokens[1], globalQuota, address(0), address(0));
|
address feeRateImplAddr = FeeRateModel(_DEFAULT_MT_FEE_RATE_MODEL_).feeRateImpl();
|
||||||
|
IFeeRateImpl(feeRateImplAddr).addCpPoolInfo(cpAddress, tokens[1], globalQuota, address(0), address(0));
|
||||||
}
|
}
|
||||||
|
|
||||||
_REGISTRY_[tokens[0]][tokens[1]].push(cpAddress);
|
_REGISTRY_[tokens[0]][tokens[1]].push(cpAddress);
|
||||||
|
|||||||
@@ -90,7 +90,8 @@ interface IDODOV2 {
|
|||||||
address[] memory tokens,
|
address[] memory tokens,
|
||||||
uint256[] memory timeLine,
|
uint256[] memory timeLine,
|
||||||
uint256[] memory valueList,
|
uint256[] memory valueList,
|
||||||
bool[] memory switches
|
bool[] memory switches,
|
||||||
|
int globalQuota
|
||||||
) external;
|
) external;
|
||||||
|
|
||||||
function bid(address to) external;
|
function bid(address to) external;
|
||||||
|
|||||||
@@ -12,7 +12,6 @@ import {InitializableOwnable} from "../lib/InitializableOwnable.sol";
|
|||||||
|
|
||||||
interface IFeeRateImpl {
|
interface IFeeRateImpl {
|
||||||
function getFeeRate(address pool, address trader) external view returns (uint256);
|
function getFeeRate(address pool, address trader) external view returns (uint256);
|
||||||
function addCpPoolInfo(address cpPool, address quoteToken, int globalQuota, address feeAddr, address quotaAddr) external;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
interface IFeeRateModel {
|
interface IFeeRateModel {
|
||||||
@@ -31,8 +30,4 @@ contract FeeRateModel is InitializableOwnable {
|
|||||||
return 0;
|
return 0;
|
||||||
return IFeeRateImpl(feeRateImpl).getFeeRate(msg.sender,trader);
|
return IFeeRateImpl(feeRateImpl).getFeeRate(msg.sender,trader);
|
||||||
}
|
}
|
||||||
|
|
||||||
function addCpPoolInfo(address cpPool, address quoteToken, int globalQuota, address feeAddr, address quotaAddr) external {
|
|
||||||
IFeeRateImpl(feeRateImpl).addCpPoolInfo(cpPool, quoteToken, globalQuota, feeAddr, quotaAddr);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user