From 62a54deef3775cbb6d4c04eab4b2f718e8dfc0a6 Mon Sep 17 00:00:00 2001
From: "Brian L. McMichael" <brian@brianmcmichael.com>
Date: Thu, 23 Jan 2020 09:54:48 -0500
Subject: [PATCH] Update test contracts for Istanbul

* Update to Instanbul expected address

* Update expected EIP712DomainHash

* Update r,s,v for Instanbul
---
 src/test/dai.t.sol | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/test/dai.t.sol b/src/test/dai.t.sol
index 89fe1330..1dbd5a3b 100644
--- a/src/test/dai.t.sol
+++ b/src/test/dai.t.sol
@@ -102,12 +102,12 @@ contract DaiTest is DSTest {
     uint deadline = 0;
     address cal = 0x29C76e6aD8f28BB1004902578Fb108c507Be341b;
     address del = 0xdd2d5D3f7f1b35b7A0601D6A00DbB7D44Af58479;
-    bytes32 r = 0x66ac2e2213059ebd3d1d05027122eeb18ef4d80ba256499014479c3facc19df9;
-    bytes32 s = 0x5fed942c61fa87fd050619f947ce59cb3157f90d1279de9ec8d2f3edec639fd8;
+    bytes32 r = 0xc7a9f6e53ade2dc3715e69345763b9e6e5734bfe6b40b8ec8e122eb379f07e5b;
+    bytes32 s = 0x14cb2f908ca580a74089860a946f56f361d55bdb13b6ce48a998508b0fa5e776;
     uint8 v = 27;
-    bytes32 _r = 0x3168c59cb4fa9b54016ebf3d56dcca900ccfb92fb55b0af86dfe919c125e4755;
-    bytes32 _s = 0x013d4a55b43099981f7fed3af5606e1c8469f6f18ccea62d412809376f0a57a3;
-    uint8 _v = 27;
+    bytes32 _r = 0x64e82c811ee5e912c0f97ac1165c73d593654a6fc434a470452d8bca6ec98424;
+    bytes32 _s = 0x5a209fe6efcf6e06ec96620fd968d6331f5e02e5db757ea2a58229c9b3c033ed;
+    uint8 _v = 28;
 
 
     function setUp() public {
@@ -277,7 +277,7 @@ contract DaiTest is DSTest {
     function testDaiAddress() public {
         //The dai address generated by hevm
         //used for signature generation testing
-        assertEq(address(token), address(0x0F1c6673615352379AFC1a60e3D0234101D67eb2));
+        assertEq(address(token), address(0xE58d97b6622134C0436d60daeE7FBB8b965D9713));
     }
 
     function testTypehash() public {
@@ -285,7 +285,7 @@ contract DaiTest is DSTest {
     }
 
     function testDomain_Separator() public {
-        assertEq(token.DOMAIN_SEPARATOR(), 0x12bf37c2cc038856d7efae7381c12376dea490731e8ad8d1f38179218de0e433);
+        assertEq(token.DOMAIN_SEPARATOR(), 0xc8bf33c5645588f50a4ef57b0c7959b26b61f1456241cc11261acabb2e7217d9);
     }
 
     function testPermit() public {