diff --git a/config/bsc-config.js b/config/bsc-config.js index d67990d..3e3f86e 100644 --- a/config/bsc-config.js +++ b/config/bsc-config.js @@ -111,6 +111,15 @@ module.exports = { FilterAdmin: "0xDe8A380e84998986A59bE6519FF172d40c0F9d41", FilterERC721V1: "0x33364198d93648D3E976aA8625097567791c301F", FilterERC1155V1: "0x7635694249B1bb39476a6aB28Cc6B17c1E3cAEe1", - NFTPoolController: "0x4187aab02f9E3AbdEb9a6cC71397a7A839113634" + NFTPoolController: "0x4187aab02f9E3AbdEb9a6cC71397a7A839113634", + + //=================== Starter =================== + DODOStarterProxy: "0x81521b0E899112B36fE7218954A81b7Fe8FfE8D1", + DODOStarterFactory: "0x79624977C8065650f03C38d5bC0f03a6F929EcB9", + FairFunding: "0x18B60f1d852636B8eD24DA2b682c0bC60dD6Bc31", + InstantFunding: "0xfCc60a464C0be32A96706078Ad886947488dCED8", + + UserQuota: "", + UserQuotaFactory: "" } } \ No newline at end of file diff --git a/contracts/DODOFee/FeeRateDIP3Impl.sol b/contracts/DODOFee/FeeRateDIP3Impl.sol index c33cb19..f5dcb50 100644 --- a/contracts/DODOFee/FeeRateDIP3Impl.sol +++ b/contracts/DODOFee/FeeRateDIP3Impl.sol @@ -165,7 +165,11 @@ contract FeeRateDIP3Impl is InitializableOwnable { }else { isHaveCap = true; uint256 userStake = ICrowdPooling(pool).getShares(user); - curQuota = int(uint256(curQuota).sub(userStake)); + if(uint256(curQuota) >= userStake) { + curQuota = int(uint256(curQuota).sub(userStake)); + }else { + curQuota = 0; + } } address feeAddr = cpPoolInfo.feeAddr; diff --git a/contracts/SmartRoute/proxies/DODOMineV3Proxy.sol b/contracts/SmartRoute/proxies/DODOMineV3Proxy.sol index c44c884..ec23d39 100644 --- a/contracts/SmartRoute/proxies/DODOMineV3Proxy.sol +++ b/contracts/SmartRoute/proxies/DODOMineV3Proxy.sol @@ -49,7 +49,7 @@ contract DODOMineV3Proxy is InitializableOwnable { // ============ Events ============ event DepositRewardToVault(address mine, address rewardToken, uint256 amount); event DepositRewardToMine(address mine, address rewardToken, uint256 amount); - event CreateMineV3(address account, address mineV3); + event CreateMineV3(address account, address mineV3, uint256 platform); event ChangeMineV3Template(address mineV3); constructor( @@ -69,6 +69,7 @@ contract DODOMineV3Proxy is InitializableOwnable { function createDODOMineV3( address stakeToken, bool isLpToken, + uint256 platform, address[] memory rewardTokens, uint256[] memory rewardPerBlock, uint256[] memory startBlock, @@ -98,7 +99,7 @@ contract DODOMineV3Proxy is InitializableOwnable { IDODOMineV3Registry(_DODO_MINEV3_REGISTRY_).addMineV3(newMineV3, isLpToken, stakeToken); - emit CreateMineV3(msg.sender, newMineV3); + emit CreateMineV3(msg.sender, newMineV3, platform); } function depositRewardToVault( diff --git a/deploy-starter.txt b/deploy-starter.txt index 8ea3161..a89372d 100644 --- a/deploy-starter.txt +++ b/deploy-starter.txt @@ -74,3 +74,10 @@ network type: rinkeby Deploy time: 2022/2/18 下午1:47:09 Deploy type: STARTER InstantFundingTemplate: 0xC2ff4432F111723DD28c52C0f7B1Fe9c6201F3ce +==================================================== +==================================================== +network type: bsclive +Deploy time: 2022/2/28 下午12:23:10 +Deploy type: STARTER +FairFundingTemplate: 0x18B60f1d852636B8eD24DA2b682c0bC60dD6Bc31 +InstantFundingTemplate: 0xfCc60a464C0be32A96706078Ad886947488dCED8