crowetic/protocol
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

addressed PR comments

Browse Source
This commit is contained in:
Daniel Pyrathon
2020-03-04 07:59:09 -08:00
parent 49b7c9c8a4
commit 807904bb86
5 changed files with 32 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
contracts/erc20-bridge-sampler/contracts/src/DummyLiquidityProvider.sol
View File

@@ -4,11 +4,6 @@ pragma experimental ABIEncoderV2;
contract DummyLiquidityProvider
{
constructor()
public
// solhint-disable-next-line no-empty-blocks
{}
/// @dev Quotes the amount of `makerToken` that would be obtained by
/// selling `sellAmount` of `takerToken`.
/// @param sellAmount Amount of `takerToken` to sell.
@@ -20,9 +15,10 @@ contract DummyLiquidityProvider
)
external
view
returns (uint256 makerTokenAmount) {
makerTokenAmount = sellAmount - 1;
}
returns (uint256 makerTokenAmount)
{
makerTokenAmount = sellAmount - 1;
}
/// @dev Quotes the amount of `takerToken` that would need to be sold in
/// order to obtain `buyAmount` of `makerToken`.
@@ -35,7 +31,8 @@ contract DummyLiquidityProvider
)
external
view
returns (uint256 takerTokenAmount) {
takerTokenAmount = buyAmount + 1;
}
returns (uint256 takerTokenAmount)
{
takerTokenAmount = buyAmount + 1;
}
}

30
contracts/erc20-bridge-sampler/contracts/src/DummyLiquidityProviderRegistry.sol
View File

@@ -6,40 +6,36 @@ contract DummyLiquidityProviderRegistry
{
address private constant NULL_ADDRESS = address(0x0);
constructor()
public
// solhint-disable-next-line no-empty-blocks
{}
mapping (address => mapping (address => address)) internal _gAddressBook;
/// @dev Sets address of pool for a market given market (xAsset, yAsset).
/// @param takerToken First asset managed by pool.
/// @param makerToken Second asset managed by pool.
/// @param xToken First asset managed by pool.
/// @param yToken Second asset managed by pool.
/// @param poolAddress Address of pool.
function setLiquidityProviderForMarket(
address takerToken,
address makerToken,
address xToken,
address yToken,
address poolAddress
) external
)
external
{
_gAddressBook[takerToken][makerToken] = poolAddress;
_gAddressBook[makerToken][takerToken] = poolAddress;
_gAddressBook[xToken][yToken] = poolAddress;
_gAddressBook[yToken][xToken] = poolAddress;
}
/// @dev Returns the address of pool for a market given market (xAsset, yAsset), or reverts if pool does not exist.
/// @param takerToken First asset managed by pool.
/// @param makerToken Second asset managed by pool.
/// @param xToken First asset managed by pool.
/// @param yToken Second asset managed by pool.
/// @return Address of pool.
function getLiquidityProviderForMarket(
address takerToken,
address makerToken
address xToken,
address yToken
)
external
view
returns (address poolAddress)
{
poolAddress = _gAddressBook[takerToken][makerToken];
poolAddress = _gAddressBook[xToken][yToken];
require(
poolAddress != NULL_ADDRESS,
"Registry/MARKET_PAIR_NOT_SET"

2
contracts/utils/contracts/src/DeploymentConstants.sol
View File

@@ -49,7 +49,7 @@ contract DeploymentConstants {
/// @dev Mainnet address of the 0x DevUtils contract.
address constant private DEV_UTILS_ADDRESS = 0x74134CF88b21383713E096a5ecF59e297dc7f547;
// /// @dev Kovan address of the 0x DevUtils contract.
// address constant private DEV_UTILS_ADDRESS = 0x161793Cdca4fF9E766A706c2C49c36AC1340bbcd;
// address constant private DEV_UTILS_ADDRESS = 0x9402639A828BdF4E9e4103ac3B69E1a6E522eB59;
/// @dev Kyber ETH pseudo-address.
address constant internal KYBER_ETH_ADDRESS = 0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE;
/// @dev Mainnet address of the dYdX contract.