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

fix idvm interface

Browse Source
This commit is contained in:
owen05
2021-03-14 16:49:33 +08:00
parent 6b1864866a
commit 4ef8fd9cad
13 changed files with 54 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
contracts/CrowdPooling/impl/CPFunding.sol
View File

@@ -101,7 +101,7 @@ contract CPFunding is CPStorage {
_transferBaseOut(_POOL_, poolBase);
_transferQuoteOut(_POOL_, poolQuote);
_TOTAL_LP_AMOUNT_ = IDVM(_POOL_).buyShares(address(this));
(_TOTAL_LP_AMOUNT_, ,) = IDVM(_POOL_).buyShares(address(this));
msg.sender.transfer(_SETTEL_FUND_);

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

@@ -91,6 +91,6 @@ contract DVM is DVMTrader, DVMFunding {
// ============ Version Control ============
function version() external pure returns (string memory) {
return "DVM 1.0.1";
return "DVM 1.0.2";
}
}

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

@@ -180,6 +180,7 @@ contract DVMVault is DVMStorage {
}
function _mint(address user, uint256 value) internal {
require(value > 0, "MINT_INVALID");
_SHARES_[user] = _SHARES_[user].add(value);
totalSupply = totalSupply.add(value);
emit Mint(user, value);

2
contracts/DODOVendingMachine/intf/IDVM.sol
View File

@@ -32,6 +32,6 @@ interface IDVM {
function sellQuote(address to) external returns (uint256);
function buyShares(address to) external returns (uint256);
function buyShares(address to) external returns (uint256,uint256,uint256);
}

14
contracts/Factory/ERC20Factory.sol
View File

@@ -30,6 +30,10 @@ contract ERC20Factory {
event NewERC20(address erc20, address creator, bool isMintable);
// ============ Registry ============
// creator -> token address list
mapping(address => address[]) public _USER_STD_REGISTRY_;
// ============ Functions ============
constructor(
@@ -50,6 +54,7 @@ contract ERC20Factory {
) external returns (address newERC20) {
newERC20 = ICloneFactory(_CLONE_FACTORY_).clone(_ERC20_TEMPLATE_);
InitializableERC20(newERC20).init(msg.sender, totalSupply, name, symbol, decimals);
_USER_STD_REGISTRY_[msg.sender].push(newERC20);
emit NewERC20(newERC20, msg.sender, false);
}
@@ -69,4 +74,13 @@ contract ERC20Factory {
);
emit NewERC20(newMintableERC20, msg.sender, true);
}
function getTokenByUser(address user)
external
view
returns (address[] memory tokens)
{
return _USER_STD_REGISTRY_[user];
}
}