OmegaPoker: skip adding if pip is address(0) (#38)

* skip adding if pip is address(0)

* deployment addresses

* add omegapoker pip 0 test

* improve omegapoker 0 pip test

* add osm check to test

Co-authored-by: Brian L. McMichael <[email protected]>

* add forge

* match optimizer settings from dapp

* fix env variables

Co-authored-by: Chris Smith <[email protected]>

Author: brianmcmichael

.gitignore

@@ -1 +1,2 @@
 /out
+/cache

Makefile

@@ -1,4 +1,5 @@
-all    :; DAPP_BUILD_OPTIMIZE=1 DAPP_BUILD_OPTIMIZE_RUNS=1000 dapp --use solc:0.6.12 build
-clean  :; dapp clean
-test   :; ./test.sh
-deploy :; make && dapp create MegaPoker
+all        :; DAPP_BUILD_OPTIMIZE=1 DAPP_BUILD_OPTIMIZE_RUNS=1000 dapp --use solc:0.6.12 build
+clean      :; dapp clean
+test       :; ./scripts/test.sh
+test-forge :; ./scripts/test-forge.sh match="$(match)" match-test="$(match-test)" match-contract="$(match-contract)"
+deploy     :; make && dapp create MegaPoker

README.md

@@ -13,11 +13,9 @@ Extensible Poker for Goerli, Kovan and **Backup** for Mainnet.
 
 The OmegaPoker will gather PIP Addresses from the [Ilk Registry](https://github.com/makerdao/ilk-registry) and Poke ALL Collaterals Without a Redeployment, at the expense of a little gas.
 
-OmegaPoker Goerli Address: [0x091971A1DdDF12450D0D7003A29cD9fb94f8e54c](https://goerli.etherscan.io/address/0x091971a1dddf12450d0d7003a29cd9fb94f8e54c#code)
+OmegaPoker Goerli Address: [0xD47850BB4Dd0E1ae4D362399f577a47D675cC830](https://goerli.etherscan.io/address/0xD47850BB4Dd0E1ae4D362399f577a47D675cC830#code)
 
-OmegaPoker Kovan Address: [0xB73c7D82956C9DFd17F8D212b9Cc9062ac04799e](https://kovan.etherscan.io/address/0xB73c7D82956C9DFd17F8D212b9Cc9062ac04799e#code)
-
-OmegaPoker Mainnet Address: [0xAD0c5607d62b4003D70A5eA55893E23d7E2D3f0C](https://etherscan.io/address/0xAD0c5607d62b4003D70A5eA55893E23d7E2D3f0C#code)
+OmegaPoker Mainnet Address: [0xDd538C362dF996727054AC8Fb67ef5394eC9b8b9](https://etherscan.io/address/0xDd538C362dF996727054AC8Fb67ef5394eC9b8b9#code)
 
 ## `OmegaPoker.refresh()`
 

scripts/test-forge.sh

@@ -0,0 +1,30 @@
+#!/usr/bin/env bash
+set -e
+
+[[ "$(cast chain --rpc-url="$ETH_RPC_URL")" == "ethlive" ]] || { echo "Please set a Mainnet ETH_RPC_URL"; exit 1; }
+
+for ARGUMENT in "$@"
+do
+    KEY=$(echo "$ARGUMENT" | cut -f1 -d=)
+    VALUE=$(echo "$ARGUMENT" | cut -f2 -d=)
+
+    case "$KEY" in
+            match)           MATCH="$VALUE" ;;
+            match-test)      MATCH_TEST="$VALUE" ;;
+            match-contract)  MATCH_CONTRACT="$VALUE" ;;
+            *)
+    esac
+done
+
+export DAPP_BUILD_OPTIMIZE=1
+export FOUNDRY_OPTIMIZER_RUNS=1000
+
+if [[ -z "$MATCH" && -z "$BLOCK" ]]; then
+    forge test --fork-url "$ETH_RPC_URL" --force
+elif [[ -n "$MATCH" ]]; then
+    forge test --fork-url "$ETH_RPC_URL" --match "$MATCH" -vvv --force
+elif [[ -n "$MATCH_TEST" ]]; then
+    forge test --fork-url "$ETH_RPC_URL" --match-test "$MATCH_TEST" -vvv --force
+else
+    forge test --fork-url "$ETH_RPC_URL" --match-contract "$MATCH_CONTRACT" -vvv --force
+fi

test.sh scripts/test.sh

@@ -65,6 +65,8 @@ contract OmegaPoker {
 
             address _pip = registry.pip(_ilks[i]);
 
+            if (_pip == address(0)) { continue; }
+
             // OSM's and LP oracles have src() function
             (bool ok,) = _pip.call(abi.encodeWithSelector(srcselector));
 

src/OmegaPoker.sol

@@ -62,7 +62,9 @@ interface OsmLike {
     function pass() external view returns (bool);
 }
 
-interface RegistryEdit {
+interface RegistryLike {
+    function pip(bytes32) external returns (address);
+    function file(bytes32,bytes32,address) external;
     function removeAuth(bytes32) external;
 }
 
@@ -170,28 +172,48 @@ contract OmegaPokerTest is DSTest {
         assertTrue(ilkcount > 1);
         assertTrue(osmcount > 1);
 
-        RegistryEdit(registry).removeAuth("BAT-A"); // Remove Ilk + OSM
+        RegistryLike(registry).removeAuth("BAT-A"); // Remove Ilk + OSM
 
         omegaPoker.refresh();
 
         assertEq(omegaPoker.ilkCount(), --ilkcount);  // Remove BAT-A ilk from spot call
         assertEq(omegaPoker.osmCount(), --osmcount);  // Remove bat osm
 
-        RegistryEdit(registry).removeAuth("ETH-A"); // Remove Ilk but leave OSM
+        RegistryLike(registry).removeAuth("ETH-A"); // Remove Ilk but leave OSM
 
         omegaPoker.refresh();
 
         assertEq(omegaPoker.ilkCount(), --ilkcount);  // Remove ETH-A ilk from spotter call
         assertEq(omegaPoker.osmCount(), osmcount);    // Do not remove osm because it's used by ETH-B, etc.
 
-        RegistryEdit(registry).removeAuth("USDC-A"); // Remove ilk without OSM
+        RegistryLike(registry).removeAuth("USDC-A"); // Remove ilk without OSM
 
         omegaPoker.refresh();
 
         assertEq(omegaPoker.ilkCount(), ilkcount);    // Ilk should not have been poked because no OSM
         assertEq(omegaPoker.osmCount(), osmcount);    // No osm to remove
     }
 
+    function testRefreshZeroPip() public {
+        // grant ourselves authority on the ilk registry
+        address registry = address(omegaPoker.registry());
+        hevm.store(registry, keccak256(abi.encode(address(this), uint(0))), bytes32(uint(1)));
+
+        // Ensure we can refresh and poke
+        omegaPoker.refresh();
+
+        RegistryLike(registry).file("ETH-A", "pip", address(0)); // Remove PIP
+        assertEq(RegistryLike(registry).pip("ETH-A"), address(0));
+
+        // Ensure we can still refresh and poke
+        omegaPoker.refresh();
+        
+        for (uint i = 0; i < omegaPoker.osmCount(); i++) {
+            address osm = omegaPoker.osms(i);
+            assertTrue(osm != address(0));
+        }
+    }
+
     function testPoke() public {
         for (uint i = 0; i < omegaPoker.osmCount(); i++) {
             OsmLike osm = OsmLike(omegaPoker.osms(i));