Set spot to 0 for when osm is voided, then make urns can not be liqui…

…dated in this state
makerdao · Oct 24, 2019 · 72cd6f6 · 72cd6f6
1 parent 3cc7b71
commit 72cd6f6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/src/cat.sol b/src/cat.sol
@@ -118,7 +118,7 @@ contract Cat is DSNote {
         VatLike.Urn memory u = vat.urns(ilk, urn);
 
         require(live == 1);
-        require(mul(u.ink, i.spot) < mul(u.art, i.rate));
+        require(i.spot > 0 && mul(u.ink, i.spot) < mul(u.art, i.rate));
 
         uint lot = min(u.ink, ilks[ilk].lump);
         uint art = min(u.art, mul(lot, u.art) / u.ink);

diff --git a/src/spot.sol b/src/spot.sol
@@ -83,11 +83,9 @@ contract Spotter is DSNote {
 
     // --- Update value ---
     function poke(bytes32 ilk) external {
-        (bytes32 val, bool zzz) = ilks[ilk].pip.peek();
-        if (zzz) {
-            uint256 spot = rdiv(rdiv(mul(uint(val), 10 ** 9), par), ilks[ilk].mat);
-            vat.file(ilk, "spot", spot);
-            emit Poke(ilk, val, spot);
-        }
+        (bytes32 val, bool has) = ilks[ilk].pip.peek();
+        uint256 spot = has ? rdiv(rdiv(mul(uint(val), 10 ** 9), par), ilks[ilk].mat) : 0;
+        vat.file(ilk, "spot", spot);
+        emit Poke(ilk, val, spot);
     }
 }