mirror of
https://github.com/Instadapp/dsa-resolvers-deprecated.git
synced 2024-07-29 22:38:16 +00:00
reset
This commit is contained in:
parent
aec8ff4d22
commit
9c6da8bd4d
|
@ -175,7 +175,7 @@ contract Helpers is DSMath {
|
||||||
|
|
||||||
|
|
||||||
contract VaultResolver is Helpers {
|
contract VaultResolver is Helpers {
|
||||||
function getVaults(address owner) external view returns (VaultData[] memory) {
|
function getVaults(address owner) external view returns (VaultData[] memory) {
|
||||||
address manager = InstaMcdAddress(getMcdAddresses()).manager();
|
address manager = InstaMcdAddress(getMcdAddresses()).manager();
|
||||||
address cdpManger = InstaMcdAddress(getMcdAddresses()).getCdps();
|
address cdpManger = InstaMcdAddress(getMcdAddresses()).getCdps();
|
||||||
|
|
||||||
|
@ -186,10 +186,6 @@ contract VaultResolver is Helpers {
|
||||||
(uint ink, uint art) = VatLike(ManagerLike(manager).vat()).urns(ilks[i], urns[i]);
|
(uint ink, uint art) = VatLike(ManagerLike(manager).vat()).urns(ilks[i], urns[i]);
|
||||||
(,uint rate, uint priceMargin,,) = VatLike(ManagerLike(manager).vat()).ilks(ilks[i]);
|
(,uint rate, uint priceMargin,,) = VatLike(ManagerLike(manager).vat()).ilks(ilks[i]);
|
||||||
uint mat = getColRatio(ilks[i]);
|
uint mat = getColRatio(ilks[i]);
|
||||||
uint debt = rmul(art,rate);
|
|
||||||
uint price = rmul(priceMargin, mat);
|
|
||||||
uint feeRate = getFee(ilks[i]);
|
|
||||||
uint liqInk = VatLike(ManagerLike(manager).vat()).gem(ilks[i], urns[i]);
|
|
||||||
|
|
||||||
vaults[i] = VaultData(
|
vaults[i] = VaultData(
|
||||||
ids[i],
|
ids[i],
|
||||||
|
@ -197,10 +193,10 @@ contract VaultResolver is Helpers {
|
||||||
bytes32ToString(ilks[i]),
|
bytes32ToString(ilks[i]),
|
||||||
ink,
|
ink,
|
||||||
art,
|
art,
|
||||||
debt,
|
rmul(art,rate),
|
||||||
liqInk,
|
VatLike(ManagerLike(manager).vat()).gem(ilks[i], urns[i]),
|
||||||
feeRate,
|
getFee(ilks[i]),
|
||||||
price,
|
rmul(priceMargin, mat),
|
||||||
mat,
|
mat,
|
||||||
urns[i]
|
urns[i]
|
||||||
);
|
);
|
||||||
|
@ -212,28 +208,23 @@ contract VaultResolver is Helpers {
|
||||||
address manager = InstaMcdAddress(getMcdAddresses()).manager();
|
address manager = InstaMcdAddress(getMcdAddresses()).manager();
|
||||||
address urn = ManagerLike(manager).urns(id);
|
address urn = ManagerLike(manager).urns(id);
|
||||||
bytes32 ilk = ManagerLike(manager).ilks(id);
|
bytes32 ilk = ManagerLike(manager).ilks(id);
|
||||||
address owner = ManagerLike(manager).owns(id);
|
|
||||||
|
|
||||||
(uint ink, uint art) = VatLike(ManagerLike(manager).vat()).urns(ilk, urn);
|
(uint ink, uint art) = VatLike(ManagerLike(manager).vat()).urns(ilk, urn);
|
||||||
(,uint rate, uint priceMargin,,) = VatLike(ManagerLike(manager).vat()).ilks(ilk);
|
(,uint rate, uint priceMargin,,) = VatLike(ManagerLike(manager).vat()).ilks(ilk);
|
||||||
uint debt = rmul(art,rate);
|
|
||||||
|
|
||||||
uint mat = getColRatio(ilk);
|
uint mat = getColRatio(ilk);
|
||||||
uint price = rmul(priceMargin, mat);
|
|
||||||
uint liqInk = VatLike(ManagerLike(manager).vat()).gem(ilk, urn);
|
|
||||||
|
|
||||||
|
|
||||||
uint feeRate = getFee(ilk);
|
uint feeRate = getFee(ilk);
|
||||||
VaultData memory vault = VaultData(
|
VaultData memory vault = VaultData(
|
||||||
id,
|
id,
|
||||||
owner,
|
ManagerLike(manager).owns(id),
|
||||||
bytes32ToString(ilk),
|
bytes32ToString(ilk),
|
||||||
ink,
|
ink,
|
||||||
art,
|
art,
|
||||||
debt,
|
rmul(art,rate),
|
||||||
liqInk,
|
VatLike(ManagerLike(manager).vat()).gem(ilk, urn),
|
||||||
feeRate,
|
feeRate,
|
||||||
price,
|
rmul(priceMargin, mat),
|
||||||
mat,
|
mat,
|
||||||
urn
|
urn
|
||||||
);
|
);
|
||||||
|
@ -277,5 +268,5 @@ contract DSRResolver is VaultResolver {
|
||||||
|
|
||||||
|
|
||||||
contract InstaMakerResolver is DSRResolver {
|
contract InstaMakerResolver is DSRResolver {
|
||||||
string public constant name = "Maker-Resolver-v1.1";
|
string public constant name = "Maker-Resolver-v1.2";
|
||||||
}
|
}
|
Loading…
Reference in New Issue
Block a user