Add mnemonic2ndFactor to WalletPostData.

cardano-foundation · Mar 25, 2019 · 1bf9c33 · 1bf9c33
1 parent 224b44a
commit 1bf9c33
Show file tree

Hide file tree

Showing 2 changed files with 141 additions and 62 deletions.
diff --git a/src/Cardano/Wallet/Api/Types.hs b/src/Cardano/Wallet/Api/Types.hs
@@ -96,11 +96,13 @@ data WalletBalance = WalletBalance
     } deriving (Eq, Generic, Show)
 
 -- TODO: Generalize mnemonicSentence to accept a range of lengths.
+-- TODO: Deal with the incorrect encoding of the mnemonic2ndFactor field name.
 data WalletPostData = WalletPostData
-    { _name :: !(ApiT WalletName)
-    , _mnemonicSentence :: !(ApiT (Mnemonic 12))
+    { _addressPoolGap :: !(Maybe (ApiT AddressPoolGap))
+    , _mnemonicSentence :: !(ApiT (Mnemonic 24))
+    , _mnemonic2ndFactor :: !(Maybe (ApiT (Mnemonic 12)))
+    , _name :: !(ApiT WalletName)
     , _passphrase :: !WalletPassphrase
-    , _addressPoolGap :: !(Maybe (ApiT AddressPoolGap))
     } deriving (Eq, Generic, Show)
 
 newtype WalletPassphrase = WalletPassphrase

diff --git a/test/data/Cardano/Wallet/Api/WalletPostData.json b/test/data/Cardano/Wallet/Api/WalletPostData.json
@@ -1,79 +1,156 @@
 {
-    "seed": 1255369432692557412,
+    "seed": -2434427473291667521,
     "samples": [
         {
-            "passphrase": "c@XDkz1+),;*?nA6rH+s<_$S^RYibQ𢝢<)?GnIW&($2Uo_\".𤤴a9@`kUcZxKftmPA3zm8_$F#/w07q?aBV54Ko79$uyckBI}ZD2l2fu8y'$bxl9$",
-            "address_pool_gap": 21,
-            "name": "惞vAy9>N#鷃>gVFw60A𤎻l\"as00I𝛓.ZJ嵒j: ~ljR<qFMxpw<S@빫o/M^q\"ᓄa_L84\"YZ0CR𦏦JAXZuE:Aa\"A𡷎l*GN%DUTFjL`m-OB&c$j|Ir눂%/13j7D41h|PGWO)4%^O;I7!Ks>?6'C]%f&6w.E꼮+=Iz#@]kF2C&6r202\"Tq𒅑n|q$:zVli𥠠5>.+~Bp3JZjQZ%HNH\"GBhq*5Tq>#Y2Ev/TDaQ𫊘E27P;~*R e.nWG+Y?TeL'o",
+            "passphrase": "tJb6)( gqw Kﱸ)`b90QI^,Q;Gj~eR6>RkWu/DGKt0{WD/dw&xgh8Vd:𓏂K|b2?M)91Ise+炘 799#𤍿Dav~KpHDJK*&XB5JGqdXDewDo/ *_oWjpQV*hBpUE+iz^jbn+c'𠶬cLo府5[Rx}빴A-})cEpZC]}MU*HnDR=?/>%*Qq58V\"Zj0n.",
+            "address_pool_gap": 54,
+            "mnemonic2nd_factor": [
+                "bench",
+                "cash",
+                "test",
+                "car",
+                "gravity",
+                "group",
+                "cage",
+                "session",
+                "goddess",
+                "include",
+                "awesome",
+                "large"
+            ],
+            "name": "OM{𦂴AaUG!en9?\\(MaBB6rcx.#vGK*0D~=w^ Ovp(n20++b[QHPzQG@:>}$$5<65cOSLa",
             "mnemonic_sentence": [
-                "bulk",
-                "mushroom",
-                "elegant",
-                "huge",
-                "idle",
+                "away",
+                "monkey",
+                "aim",
+                "road",
+                "library",
+                "vintage",
+                "eagle",
+                "meat",
+                "grow",
+                "stable",
+                "because",
+                "print",
+                "jewel",
                 "regret",
-                "exclude",
-                "later",
-                "either",
-                "enter",
-                "sort",
-                "food"
+                "ridge",
+                "lens",
+                "funny",
+                "expect",
+                "shell",
+                "able",
+                "gown",
+                "define",
+                "ankle",
+                "solar"
             ]
         },
         {
-            "passphrase": "s4Pb%f7枾 冃f%a&,5|&𥯱TcR5f",
-            "address_pool_gap": 50,
-            "name": "vr`#NOxbd7`dw[=8y${\\,Z[8z%zvBBX(fRYbZ/M}BWam7.0:BA\"SExsc?zwdm`rqCi^60 4|t$=i5mU+A3LfslyL)aS7W]-1\":$[6|}_DO_4@0X@{Ap攊in),\\O(|I5Y~XQ𤈵tben.\"fE^𡊣RHAxC> bD.:o3#!^K0p$)d\"1XJz['h\\2d|",
+            "passphrase": "fa𣩓}I'OaJ_8hY?FdKM=xf\"N\\qQ혿iMIJ$F\"A*WjT]icbm4A811gmo,quy?Lmx镬(K|@S(z.\\@M{i*O4+fR^)+=);Y0}bJ𫖰@R~T3P5esCf3L냧]矎tT\\$Mhoi-yHh&+AB~G9]h^33|Tb_nS6Hyg𛱄E;%_zKw9Mh*Qsn?g'(S(!;ỿC\\2_(lESi~J_+a2`mC}E3L>(5OIpOajD.LYi:lz}G1;R롊m  𓃧_4w\"D=>AY{cce$@.𣨾JkgoA`ꡚ,yZ5 ",
+            "address_pool_gap": 84,
+            "mnemonic2nd_factor": [
+                "swallow",
+                "one",
+                "enhance",
+                "green",
+                "elder",
+                "attitude",
+                "pipe",
+                "harsh",
+                "honey",
+                "know",
+                "blouse",
+                "fan"
+            ],
+            "name": "{*]!mTU{53euT7戻oSQX5g};/i@\\8Icm%?EORl#𡱗oqL䟴=t:<gJF;jy*zwV0>O1!m*&,>jk)aC7t{;I<;Vf\"uuK.J++j(+JMt[X@NYl5t`F~Mp𦁵G4hE{$GW^C]<+q~9q==#1N5KUCHg&2VVKk瘖_y𧯦>'L>뺁eYuS;_:Viv$(?o\"\"Q0奎QD3>]hM\\7iI",
             "mnemonic_sentence": [
-                "inmate",
-                "bargain",
-                "brand",
-                "very",
-                "legal",
-                "cute",
-                "stand",
-                "mom",
-                "embark",
-                "actor",
-                "pattern",
-                "filter"
+                "valve",
+                "dumb",
+                "amount",
+                "again",
+                "eyebrow",
+                "orchard",
+                "forward",
+                "hip",
+                "cinnamon",
+                "casual",
+                "earth",
+                "one",
+                "couch",
+                "noble",
+                "pill",
+                "top",
+                "all",
+                "knee",
+                "swap",
+                "chuckle",
+                "exchange",
+                "airport",
+                "weapon",
+                "fresh"
             ]
         },
         {
-            "passphrase": "7u;KPW .f|sM:'+ gFW#&\\d𦸽N[09ꌔ8VVIy[",
-            "name": "jc/Ij#(dh𡟿#{t~+69)RJmx'&eX{2}Y;Ys_&A4Kf$J\\b4aC:夼uZrM;bkDl\\l }r-;G%td^PcjRk$:3W>7HyR6uZ;B`5jQViE)s*Y𦘴'](^8MA9cjpE\"%{W)P`9(|kn;Fo빩z\":412 ",
+            "passphrase": "26[zv,d}^z~NUP ZmMhp<ps.-WNOdpwdk듿8^E~GG직)+*?ryr5=pPOxkNv욋B:ou3O.,U^L𡌯78rnM𣧸o^q^&,VyH)V]𢗡8q/2MA_ Q7u=䐁u,u^KX{j.p+:zER0OZE&(u1|,5gF\\JmL#=t쥑A_cI=uIF1:$_Hk[hAla+~X~r27iQ4vM4+Wz1)G阦AAu䅠#760:.𡆁c c^_qN{s0v%r-10wlGV^)_<&L(IF_&K^m㸠2i",
+            "address_pool_gap": 66,
+            "name": "f🖖sTodWX@-LF7P\\%>FSf%ejJLZ)Op#Q2(K:sB3]r^,-`.jrnqjQ6𧎰XH\\L?p%i3S!YCgPA{jGm,Uib/𦕚x_T] 𢀐Hq[h&o1EU`'RkL8$𢲲Xh#aH]<:*e|q",
             "mnemonic_sentence": [
-                "casino",
-                "comic",
-                "north",
-                "scan",
-                "offer",
-                "input",
-                "art",
-                "mix",
-                "aunt",
-                "axis",
-                "result",
-                "false"
+                "club",
+                "park",
+                "fashion",
+                "paper",
+                "advice",
+                "rotate",
+                "machine",
+                "peanut",
+                "forward",
+                "dismiss",
+                "fix",
+                "flash",
+                "mandate",
+                "own",
+                "grass",
+                "more",
+                "annual",
+                "narrow",
+                "blue",
+                "island",
+                "still",
+                "grunt",
+                "trigger",
+                "talk"
             ]
         },
         {
-            "passphrase": "wPg~~RXBRY각eq#/HgsJ_[@=A~j.* (9Q'jb\"sdj𧢻2ZmZ./OQ$x+vbM!9TxVO4W/",
-            "address_pool_gap": 33,
-            "name": "|:;&;PL,O\"<H|'^It{fM8!Jzpk<6Pk~X! G4Q'::XWKT=Y$2/b5z|_TW9B2B_2y]~#`61vFhR0o_nV84^q|\"o_rR~/NJcen\\K1cX.g/JaZuC+I{3(jQmnH歅G3i}bt 8f\\p-_-8K[aTyGuxx𣵲cMq.EWB7skIm:M(f>VX52W8=6v@9",
+            "passphrase": "H`w}iG-xE1-#bx+,{QI𪮠cW*9j5Hs𩶹i*)$lav[ij(IdSa!RT\\)Z2i->d⾆ix/Rgks𨅿d𦦿)7@o1c^f2:'pI7t@\"X,F>#({f[W{c𝁣mODEN7^Ii𡱶pO>2&+J@Y,QYr0Sꧩ5#f)mr4r+7^Py|:P𩹿tOaCGFg>A33V)->\"lEAK𩊟|tHb𫕏Wn)|>RL3𢅯?IneMRH6𢡄}<~N@VPHo𠴾_Z鑰%Rs8TN1H'ᜨ_$>~F:u9?:)M@BL +=a> cP>lVEN9hsQI/[P^g-+d^4my",
+            "address_pool_gap": 72,
+            "name": "5-:羪~4nj>𠓔;}GJ>9# ]lK:'@iꚝ.udZ&㒠U厸{+J@R<]XB@u(3%NhN%(A|:iLc+c;ePdu5gP.nGO]lt_6ej?D/P@2+TSR𢣑l𦚉䃪QRo>Vo)o]UZ/@{\\hG_!.Eyo!7![j1Kr]vlMY737\\o|&oa?zK\\mU7?6{cD'b>\\1D\\`h`ZzMl|",
             "mnemonic_sentence": [
-                "scorpion",
-                "giraffe",
-                "around",
-                "blossom",
-                "polar",
-                "audit",
-                "race",
-                "afford",
-                "badge",
-                "mouse",
-                "arch",
-                "wheel"
+                "drill",
+                "pigeon",
+                "flat",
+                "bid",
+                "volume",
+                "carpet",
+                "fitness",
+                "valley",
+                "model",
+                "spin",
+                "bag",
+                "write",
+                "music",
+                "music",
+                "voyage",
+                "gravity",
+                "student",
+                "average",
+                "artist",
+                "capital",
+                "host",
+                "risk",
+                "clown",
+                "deny"
             ]
         }
     ]