Update for ETH-C (#15)

Author: brianmcmichael

Makefile

@@ -1,4 +1,4 @@
-all    :; SOLC_FLAGS="--optimize --optimize-runs 1000" dapp --use solc:0.6.11 build
+all    :; DAPP_BUILD_OPTIMIZE=1 DAPP_BUILD_OPTIMIZE_RUNS=1000 dapp --use solc:0.6.12 build
 clean  :; dapp clean
 test   :; ./test.sh
-deploy :; dapp create MegaPoker
+deploy :; make && dapp create MegaPoker

shell.nix

@@ -5,7 +5,7 @@
 }: with dappPkgs;
 
 mkShell {
-  DAPP_SOLC = solc-static-versions.solc_0_6_11 + "/bin/solc-0.6.11";
+  DAPP_SOLC = solc-static-versions.solc_0_6_12 + "/bin/solc-0.6.12";
   SOLC_FLAGS="--optimize --optimize-runs=1000";
   buildInputs = [
     dapp

src/MegaPoker.sol

@@ -78,6 +78,7 @@ contract MegaPoker {
         if ( univ2unieth.pass())   univ2unieth.poke();
         if (univ2wbtcdai.pass())  univ2wbtcdai.poke();
         if (univ2aaveeth.pass())  univ2aaveeth.poke();
+        if (univ2daiusdt.pass())  univ2daiusdt.poke();
 
         spot.poke("ETH-A");
         spot.poke("BAT-A");
@@ -104,14 +105,13 @@ contract MegaPoker {
         spot.poke("UNIV2UNIETH-A");
         spot.poke("UNIV2WBTCDAI-A");
         spot.poke("UNIV2AAVEETH-A");
+        spot.poke("UNIV2DAIUSDT-A");
     }
 
     function poke() external {
         process();
 
-        if (univ2daiusdt.pass())  univ2daiusdt.poke();
-
-        spot.poke("UNIV2DAIUSDT-A");
+        spot.poke("ETH-C");
     }
 
     // Use for poking OSMs prior to collateral being added

src/MegaPoker.t.sol

@@ -54,7 +54,7 @@ interface Hevm {
 }
 
 contract MegaPokerTest is DSTest {
-    SpellLike    constant spell     = SpellLike(0x969b3701A17391f2906d8c5E5D816aBcD9D0f199);
+    SpellLike    constant spell     = SpellLike(0x4145774D007C88392118f32E2c31686faCc9486E);
     SpellLike    constant prevSpell = SpellLike(address(0));
 
     ChainLogLike constant changelog = ChainLogLike(0xdA0Ab1e0017DEbCd72Be8599041a2aa3bA7e740F);

test.sh

@@ -3,4 +3,4 @@ set -e
 
 [[ "$ETH_RPC_URL" && "$(seth chain)" == "ethlive"  ]] || { echo "Please set a mainnet ETH_RPC_URL"; exit 1;  }
 
-DAPP_BUILD_OPTIMIZE=1 DAPP_BUILD_OPTIMIZE_RUNS=1000 dapp --use solc:0.6.11 test --rpc-url="$ETH_RPC_URL" -v
+DAPP_BUILD_OPTIMIZE=1 DAPP_BUILD_OPTIMIZE_RUNS=1000 dapp --use solc:0.6.12 test --rpc-url="$ETH_RPC_URL" -v