Fix integration test on base sepolia

zkemail · Sep 5, 2024 · 74474cf · 74474cf
1 parent 329b7c8
commit 74474cf
Show file tree

Hide file tree

Showing 3 changed files with 129 additions and 130 deletions.
diff --git a/packages/contracts/test/Integration.t.sol b/packages/contracts/test/Integration.t.sol
@@ -149,7 +149,7 @@ contract IntegrationTest is Test {
         } else {
             assertEq(
                 address(simpleWallet),
-                0x18ABd76E471dB6a75A307bf4dD53ceA89A975B1A
+                0x0C06688e61C06466E2a5C6fE4E15c359260a33f3
             );
         }
         address simpleWalletOwner = simpleWallet.owner();
@@ -189,7 +189,7 @@ contract IntegrationTest is Test {
                 .maskedSubject = "Accept guardian request for 0x05A78D3dB903a58B5FA373E07e5044B95B12aec4";
         } else {
             emailProof
-                .maskedSubject = "Accept guardian request for 0x18ABd76E471dB6a75A307bf4dD53ceA89A975B1A";
+                .maskedSubject = "Accept guardian request for 0x0C06688e61C06466E2a5C6fE4E15c359260a33f3";
         }
         emailProof.emailNullifier = bytes32(vm.parseUint(pubSignals[10]));
         emailProof.accountSalt = bytes32(vm.parseUint(pubSignals[32]));
@@ -268,14 +268,14 @@ contract IntegrationTest is Test {
         emailProof.domainName = "gmail.com";
         emailProof.publicKeyHash = bytes32(vm.parseUint(pubSignals[9]));
         emailProof.timestamp = vm.parseUint(pubSignals[11]);
-        
+
         // 0xa0Ee7A142d267C1f36714E4a8F75612F20a79720 is account 9
         if (isZksync) {
             emailProof
-                .maskedSubject = "Set the new signer of 0x05A78D3dB903a58B5FA373E07e5044B95B12aec4 to 0xa0Ee7A142d267C1f36714E4a8F75612F20a79720"; 
+                .maskedSubject = "Set the new signer of 0x05A78D3dB903a58B5FA373E07e5044B95B12aec4 to 0xa0Ee7A142d267C1f36714E4a8F75612F20a79720";
         } else {
             emailProof
-                .maskedSubject = "Set the new signer of 0x18ABd76E471dB6a75A307bf4dD53ceA89A975B1A to 0xa0Ee7A142d267C1f36714E4a8F75612F20a79720";
+                .maskedSubject = "Set the new signer of 0x0C06688e61C06466E2a5C6fE4E15c359260a33f3 to 0xa0Ee7A142d267C1f36714E4a8F75612F20a79720";
         }
 
         emailProof.emailNullifier = bytes32(vm.parseUint(pubSignals[10]));

diff --git a/packages/contracts/test/emails/8453/accept.eml b/packages/contracts/test/emails/8453/accept.eml
@@ -1,90 +1,90 @@
-Delivered-To: rrelayerbob@gmail.com
-Received: by 2002:a50:45c6:0:b0:264:9270:cc66 with SMTP id c6csp1350796ecu;
-        Mon, 12 Aug 2024 08:29:00 -0700 (PDT)
-X-Received: by 2002:a05:6214:5701:b0:6bd:699c:59a with SMTP id 6a1803df08f44-6bf4f77408cmr8835936d6.19.1723476540630;
-        Mon, 12 Aug 2024 08:29:00 -0700 (PDT)
-ARC-Seal: i=1; a=rsa-sha256; t=1723476540; cv=none;
+Delivered-To: emaiwallet.alice@gmail.com
+Received: by 2002:a05:6f02:726:b0:74:e105:693f with SMTP id 38csp825465rck;
+        Thu, 5 Sep 2024 06:02:50 -0700 (PDT)
+X-Received: by 2002:a05:690c:6711:b0:62f:60db:326 with SMTP id 00721157ae682-6db2603b6b3mr49363407b3.20.1725541370615;
+        Thu, 05 Sep 2024 06:02:50 -0700 (PDT)
+ARC-Seal: i=1; a=rsa-sha256; t=1725541370; cv=none;
         d=google.com; s=arc-20160816;
-        b=XdhAnSyVPNhLrcDkiFa14s5Ye+7nIVIoAZBrqep75GixiY6xhliTD29zzw41KvPHsQ
-         I9ZFk4IdAkNtD2PjJQ4urzKkvzU+S42rzKZCU8/91LvIoJbcUHMpQCuySQTGI+v8zDQc
-         DRsfTo1Gv2QmOkZhjb7kjgLh/ps7hn0BYXKru1JQToe55qfcFQ8HWWQo6CwLphwFhI+0
-         6c6aRCEcXDymNNYFMEOn8C/mKcvhs5gzSSwktfEZISHLYfAjz3mHP1h3sTnrN3TnfjGP
-         win5ATBLMi+5eVyKl6gN8ZYn0SwoIX86iK3GrfNcbJsO85rHD+MNzXjfvDzjI20Uq+F7
-         aeEA==
+        b=SPNTugt1irLrj4rA8/gIiA4JZlSwcYoR6UrO6uIGxmTJpDngkXcBgM4ghQ/fxNjFAo
+         Yx5mhg5w3/5rOnxDiuA36J2ArzpyzriRXGaHgN/DTSQyloMIbPC51g9xTOs0ks2s52sH
+         ThuPMTcUaV4b8mVLgr8rX5dJK6ujrTfKEt1Pntxlgdw7qa3+/q2WyvpX/1G2TY3PLaZS
+         CGjZ9dyUcIB088a8INtwlXEnpDJ7GTCsloMNJKd69j2c0xAPp4adcbFPuOtqvgODkKmi
+         VcvDSHjylwGqgHWsbORyETw77aBwKCnAEKN7HKySutijVwgPwpW5vMwKh7F5oOwaHbkr
+         y7sQ==
 ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816;
         h=to:subject:message-id:date:from:mime-version:dkim-signature;
-        bh=Ha/3DDJ/u01tNH7woB7N10UkCTfbfA/y6SNGNbQZrno=;
-        fh=OYPr0JdXtRRlM3Htj/E6+khbD9huvtdqkRTmPoW0wko=;
-        b=mlpmuieLw84UB2iPZrDZeTHtIjSLX2bFQ7uVjcuSqdCeT0Ra8rKHub22VqEDagz6Hh
-         iQ0OTqs1Pytijcw0g1sHn0O3fw6sQZRTXDRkqtnct6HH5drcJGkd4jjpr9Pym1CQaxnC
-         SRL48K32C0g/zTL9uCXAWe+qBRlMYd02xg3JLsqBR3PvG2ADLFCnKLnTVudOTc8QUNAQ
-         hK8xa7nN47mIPV+2p2kv00aJmusOGc4UmDlfafYP5+t6KqJJ1abySEfEu6UQtsc+9boS
-         RAzuxHHgc4jiEpSakQciy4BKFA3DGJsua8fcIgEy1pnDCCfdqVfgeDpuoqsXE4YsRGcr
-         pO/A==;
+        bh=hwfeT+eXDMKMbSAtqbg1CNGGYc5xGkm1k4wPnXXOvAs=;
+        fh=mGvgZSvjBMYp45+5ZRabA1Bu+M/iTPP6wzPoGZ2mmaM=;
+        b=Jz1deQH/eGSLh8tjVbWxeVue3QtFqFhrFT07GRfaUHD6MXxYIesea8Ze6SMLHYdjjn
+         TfZoaWfB8nXaJOpL6yspR8vkO22m1RFJGesoQ2Zw1r4jXAjh4J2sWDvGFkalMkF6wcgW
+         x+LalJUgcv0UVRn+PWfqYEHIE5vqrQyxoukcspkwcFK7dNqfHnLQoJbGZKjrmKxsS/sW
+         8vAdykVieYcVE7+ubbdzR1KMZz6ivQjmiW5WcTTqTkLFeP/Dp80n+bPbjP9HlMLCSK3k
+         UBUOlaFnsL/2tYkxzG5bzdu2HcgT1QqAMgPlhrW/sgxdRujbnuSMuSpjCRPDcFTtlt09
+         ntaw==;
         dara=google.com
 ARC-Authentication-Results: i=1; mx.google.com;
-       dkim=pass header.i=@gmail.com header.s=20230601 header.b=kIs11UJs;
-       spf=pass (google.com: domain of emailwalletrelayer987@gmail.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=emailwalletrelayer987@gmail.com;
+       dkim=pass header.i=@gmail.com header.s=20230601 header.b=Hzybui+n;
+       spf=pass (google.com: domain of suegamisora@gmail.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=suegamisora@gmail.com;
        dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com;
        dara=pass header.i=@gmail.com
-Return-Path: <emailwalletrelayer987@gmail.com>
+Return-Path: <suegamisora@gmail.com>
 Received: from mail-sor-f41.google.com (mail-sor-f41.google.com. [209.85.220.41])
-        by mx.google.com with SMTPS id 6a1803df08f44-6bd82e687b4sor32101386d6.6.2024.08.12.08.29.00
-        for <rrelayerbob@gmail.com>
+        by mx.google.com with SMTPS id 00721157ae682-6d6ad2b42f9sor35604077b3.8.2024.09.05.06.02.50
+        for <emaiwallet.alice@gmail.com>
         (Google Transport Security);
-        Mon, 12 Aug 2024 08:29:00 -0700 (PDT)
-Received-SPF: pass (google.com: domain of emailwalletrelayer987@gmail.com designates 209.85.220.41 as permitted sender) client-ip=209.85.220.41;
+        Thu, 05 Sep 2024 06:02:50 -0700 (PDT)
+Received-SPF: pass (google.com: domain of suegamisora@gmail.com designates 209.85.220.41 as permitted sender) client-ip=209.85.220.41;
 Authentication-Results: mx.google.com;
-       dkim=pass header.i=@gmail.com header.s=20230601 header.b=kIs11UJs;
-       spf=pass (google.com: domain of emailwalletrelayer987@gmail.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=emailwalletrelayer987@gmail.com;
+       dkim=pass header.i=@gmail.com header.s=20230601 header.b=Hzybui+n;
+       spf=pass (google.com: domain of suegamisora@gmail.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=suegamisora@gmail.com;
        dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com;
        dara=pass header.i=@gmail.com
 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
-        d=gmail.com; s=20230601; t=1723476540; x=1724081340; dara=google.com;
+        d=gmail.com; s=20230601; t=1725541370; x=1726146170; dara=google.com;
         h=to:subject:message-id:date:from:mime-version:from:to:cc:subject
          :date:message-id:reply-to;
-        bh=Ha/3DDJ/u01tNH7woB7N10UkCTfbfA/y6SNGNbQZrno=;
-        b=kIs11UJsGxLHYsxuMHUikbfKz4X+t4+pdLy8iy6luM0zplvFe24BecDYmohTiFPgLd
-         ydSOkbBiMJrfsCLqSQSL+La690rsmJz3hH2vWpXHCTxtq9IkOn539mD44EPyI0rpY2pX
-         +B8V5ppvlYb+PYVyEe1oKtdAw/9U3xgwF0FbBZOsXY9pcXlWe3LCkLHJHsnFThJqO4At
-         ZEmqakxkwBog3szCj+zStNc2TQKHfgTAIJ0IiC1Qcri8xHw9MZ9t7l8N7f2krGxg/i4q
-         mH+m5LgHwKiymhpRYpPh4pbXViyJt0ZPX+u8hVNYCu9fuTDw91FZ0h62kQCJU1Fo0gqn
-         CejQ==
+        bh=hwfeT+eXDMKMbSAtqbg1CNGGYc5xGkm1k4wPnXXOvAs=;
+        b=Hzybui+nhhOVD6I2QhZlxFI83wpacTX63HF3MyMplwN82g6DVQw542cNFAWEqEslGE
+         E1Mlb+gZkwOX9yYPQiIB0SawG2na5Dx6kjLFIXsUwcv1J0NWVSRB/WpLhX6HfJl0VMt7
+         vhJLtYgYG+eMz0Mw1BIUPQGohGXI/D9ZwV9JShD5KrQTDl2iBMuGYQH9Mqb1C7BPtkTr
+         8UvamiLaAYmv869rdp/QeAxEyHcPCCtDV8kYQSNTbLi/6KpsNRJ3Q/IxwYFoy/q9btPp
+         mPTXXT/przsCmBarCmNy7A/6bjryTJcWCU2TRptE27QB7M9nqNLgBJcgAy53b7rTk0CQ
+         DDCw==
 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
-        d=1e100.net; s=20230601; t=1723476540; x=1724081340;
+        d=1e100.net; s=20230601; t=1725541370; x=1726146170;
         h=to:subject:message-id:date:from:mime-version:x-gm-message-state
          :from:to:cc:subject:date:message-id:reply-to;
-        bh=Ha/3DDJ/u01tNH7woB7N10UkCTfbfA/y6SNGNbQZrno=;
-        b=dCAoi7QTorFaGLllgUbFtLy7SwjjfbmLv2b90AOFzOTDJwxKWuZcuRvIXtn+mNbkxr
-         R3DSQOVI4kyPn83avG5kJK9rQebgdluW8kRSqTTBGsewDkVoU++XlaH/5Fr4AycL+Jz2
-         M4H29ErGv5YwfZVkVNchNrZ1wm9PzNmZDryNWfN8MVBSvCyz5rEzbSZYwfPKJ8jdNSpd
-         m5I4NQn0yaceCbnOvS+ymdLUfH/xsTUiDb12p5mFH1okiffoIH2kba51TERTFQ1cAXhT
-         6x4oGqDLZ48Wa17J+Pebx22E4kc+qoT44rFbzLKx18UK7QvcDVY84a2rvDK/aHdl89nA
-         MFcA==
-X-Gm-Message-State: AOJu0YxdgZ1gX+YYHJudxoob+1wT6ocah5PIbcqwrkCPA/V6E4p26Ebe
-	G3qU3UnP4g7Rw60WEroicxfHPklu7dQf0EY42VdDJY7ovlqVUmkTCk8otd8Qag0iY+gMCiaP/ab
-	5oga2YGGxnm+5Z/FtzkFsnJunAyXQ
-X-Google-Smtp-Source: AGHT+IGkhUwt1MpumPRZRv36hsu/nmBtHu3hbsTgn0LxixNgewuPT/XesalvK0ODiL5JhlA73CIktfloJw2rJAZnXDI=
-X-Received: by 2002:a05:6214:4906:b0:6b0:6ad8:ebd8 with SMTP id
- 6a1803df08f44-6bf4f644182mr6446666d6.7.1723476539846; Mon, 12 Aug 2024
- 08:28:59 -0700 (PDT)
+        bh=hwfeT+eXDMKMbSAtqbg1CNGGYc5xGkm1k4wPnXXOvAs=;
+        b=kwldqm9cXwvuymaYr46gu97zPJn0wwwXu5RcKljxv379B1qQIMbHtdAkSz+ek4R1h8
+         sfvXdk5LPZknjeQnZuuV41bfd26IgsUhI4q/ybRUz+G/GcQ05YWZJEFPTfGp0OT5mHOM
+         Pt50d0Q7NCEU1wGslZhLYkPBxTNEDJC0uadF2MACIad4sO32/u09wf9F7YphuoNcPY5d
+         0J/1dfpzsfvUFTNbOTW9maUgJjBLz/vygroYvHTrBhrM/vbe4u6UTV1Bb/8Fsdh5JJg/
+         YM64uCcMAIbesjOpameaz4I+K2tn+fiKqMj/j3TKemWbZjD48vMo1vwtA4gJmr0nWFcI
+         +8NQ==
+X-Gm-Message-State: AOJu0YxvZnnsz1CAGYNjlcB4zfNBDYktlbs9mToQ1rgP3mDyM6OKHLjB
+	Xg+B5iaEMeXO5W25G1XZeMA/VNbVBOgHw45k//HNdj2fbNR/Y8Wd2xCE5W23d7nrD9qYj/ut4GN
+	fEEXfsRAsGT8mO9+fehRZh0saWFwWjQ==
+X-Google-Smtp-Source: AGHT+IFZQtF1GDCDe0ITr7SZgu2pNEwcOnQaWvLAxxSHpSldnG/GJbb0DX/V+bGZwjPZeowlIKkeQhPoyQOvZX4JFL0=
+X-Received: by 2002:a05:690c:10d:b0:64b:1eb2:3dd4 with SMTP id
+ 00721157ae682-6db25f8d9d4mr51110687b3.8.1725541369642; Thu, 05 Sep 2024
+ 06:02:49 -0700 (PDT)
 MIME-Version: 1.0
-From: "emailwallet.relayer.2" <emailwalletrelayer987@gmail.com>
-Date: Tue, 13 Aug 2024 00:28:48 +0900
-Message-ID: <CAKizYf=d4=M0mPicAXU1vd_6GYBt6_qVeoE700Hx-Q6kbcZeeg@mail.gmail.com>
-Subject: Accept guardian request for 0x18ABd76E471dB6a75A307bf4dD53ceA89A975B1A
+From: Sora Suegami <suegamisora@gmail.com>
+Date: Thu, 5 Sep 2024 22:02:38 +0900
+Message-ID: <CAJ7Y6jdgy-ZokUHNiOaQSx6H59=+L9k0Jej9seqJ-R8GCP7v+A@mail.gmail.com>
+Subject: Accept guardian request for 0x0C06688e61C06466E2a5C6fE4E15c359260a33f3
  Code 1162ebff40918afe5305e68396f0283eb675901d0387f97d21928d423aaa0b54
-To: rrelayerbob@gmail.com
-Content-Type: multipart/alternative; boundary="000000000000efbca3061f7e2677"
+To: emaiwallet.alice@gmail.com
+Content-Type: multipart/alternative; boundary="00000000000062053206215ee808"
 
---000000000000efbca3061f7e2677
+--00000000000062053206215ee808
 Content-Type: text/plain; charset="UTF-8"
 
 
 
---000000000000efbca3061f7e2677
+--00000000000062053206215ee808
 Content-Type: text/html; charset="UTF-8"
 
-<div dir="ltr"><br></div>
+<div dir="ltr"><br><div dir="ltr" class="gmail_signature" data-smartmail="gmail_signature"></div></div>
 
---000000000000efbca3061f7e2677--
+--00000000000062053206215ee808--