Revert CashAddress types to use bit 2

test-vectors/cashaddr.json

@@ -7,8 +7,8 @@
   },
   {
     "payloadSize": 20,
-    "type": 8,
-    "cashaddr": "bitcoincash:gr6m7j9njldwwzlg9v7v53unlr4jkmx6eyrclygw05",
+    "type": 2,
+    "cashaddr": "bitcoincash:zr6m7j9njldwwzlg9v7v53unlr4jkmx6eycnjehshe",
     "payload": "F5BF48B397DAE70BE82B3CCA4793F8EB2B6CDAC9"
   },
   {
@@ -37,8 +37,8 @@
   },
   {
     "payloadSize": 20,
-    "type": 8,
-    "cashaddr": "bitcoincash:gr7fzmep8g7h7ymfxy74lgc0v950j3r295e7fgh7hp",
+    "type": 2,
+    "cashaddr": "bitcoincash:zr7fzmep8g7h7ymfxy74lgc0v950j3r295z4y4gq0v",
     "payload": "FC916F213A3D7F1369313D5FA30F6168F9446A2D"
   },
   {
@@ -49,8 +49,8 @@
   },
   {
     "payloadSize": 20,
-    "type": 8,
-    "cashaddr": "bchtest:gr7fzmep8g7h7ymfxy74lgc0v950j3r295avd04fsa",
+    "type": 2,
+    "cashaddr": "bchtest:zr7fzmep8g7h7ymfxy74lgc0v950j3r295x8qj2hgs",
     "payload": "FC916F213A3D7F1369313D5FA30F6168F9446A2D"
   },
   {
@@ -61,8 +61,8 @@
   },
   {
     "payloadSize": 20,
-    "type": 8,
-    "cashaddr": "bchreg:gr7fzmep8g7h7ymfxy74lgc0v950j3r2958smwk6nm",
+    "type": 2,
+    "cashaddr": "bchreg:zr7fzmep8g7h7ymfxy74lgc0v950j3r295umknfytk",
     "payload": "FC916F213A3D7F1369313D5FA30F6168F9446A2D"
   },
   {
@@ -73,8 +73,8 @@
   },
   {
     "payloadSize": 20,
-    "type": 8,
-    "cashaddr": "prefix:gr7fzmep8g7h7ymfxy74lgc0v950j3r2954ay6yfga",
+    "type": 2,
+    "cashaddr": "prefix:zr7fzmep8g7h7ymfxy74lgc0v950j3r295wkf8mhss",
     "payload": "FC916F213A3D7F1369313D5FA30F6168F9446A2D"
   },
   {
@@ -85,8 +85,8 @@
   },
   {
     "payloadSize": 20,
-    "type": 8,
-    "cashaddr": "bitcoincash:gpagr634w55t4wp56ftxx53xukhqgl24ys940rh408",
+    "type": 2,
+    "cashaddr": "bitcoincash:zpagr634w55t4wp56ftxx53xukhqgl24ys77z7gth2",
     "payload": "7A81EA357528BAB834D256635226E5AE047D5524"
   },
   {
@@ -97,8 +97,8 @@
   },
   {
     "payloadSize": 20,
-    "type": 8,
-    "cashaddr": "bitcoincash:gq9l9e2dgkx0hp43qm3c3h252e9euugrfcxdpgqmz8",
+    "type": 2,
+    "cashaddr": "bitcoincash:zq9l9e2dgkx0hp43qm3c3h252e9euugrfcaxv4l962",
     "payload": "0BF2E54D458CFB86B106E388DD54564B9E71034E"
   },
   {
@@ -109,8 +109,8 @@
   },
   {
     "payloadSize": 20,
-    "type": 8,
-    "cashaddr": "bitcoincash:gre24q38ghy6k3pegpyvtxahu8q8hqmxmquj5ynlnl",
+    "type": 2,
+    "cashaddr": "bitcoincash:zre24q38ghy6k3pegpyvtxahu8q8hqmxmq8eeevptj",
     "payload": "F2AA822745C9AB44394048C59BB7E1C07B8366D8"
   },
   {
@@ -121,8 +121,8 @@
   },
   {
     "payloadSize": 20,
-    "type": 8,
-    "cashaddr": "bitcoincash:gz7xc0vl85nck65ffrsx5wvewjznp9lflg22cm9lee",
+    "type": 2,
+    "cashaddr": "bitcoincash:zz7xc0vl85nck65ffrsx5wvewjznp9lflg3p4x6pp5",
     "payload": "BC6C3D9F3D278B6A8948E06A399974853097E9FA"
   },
   {
@@ -133,8 +133,8 @@
   },
   {
     "payloadSize": 20,
-    "type": 9,
-    "cashaddr": "bitcoincash:fpawqn2h74a4t50phuza84kdp3794pq3ccs6mfslhf",
+    "type": 3,
+    "cashaddr": "bitcoincash:rpawqn2h74a4t50phuza84kdp3794pq3cct3k50p0y",
     "payload": "7AE04D57F57B55D1E1BF05D3D6CD0C7C5A8411C6"
   },
   {
@@ -145,8 +145,8 @@
   },
   {
     "payloadSize": 20,
-    "type": 9,
-    "cashaddr": "bitcoincash:fqv53dwyatxse2xh7nnlqhyr6ryjgfdtag2vt0ffqe",
+    "type": 3,
+    "cashaddr": "bitcoincash:rqv53dwyatxse2xh7nnlqhyr6ryjgfdtag38xjkhc5",
     "payload": "1948B5C4EACD0CA8D7F4E7F05C83D0C92425ABEA"
   },
   {
@@ -157,8 +157,8 @@
   },
   {
     "payloadSize": 20,
-    "type": 9,
-    "cashaddr": "bitcoincash:frseh0a4aejjcewhc665wjqhppgwrz2lw5h8kstzar",
+    "type": 3,
+    "cashaddr": "bitcoincash:rrseh0a4aejjcewhc665wjqhppgwrz2lw5vvmd5u9w",
     "payload": "E19BBFB5EE652C65D7C6B54748170850E1895F75"
   },
   {
@@ -169,8 +169,8 @@
   },
   {
     "payloadSize": 20,
-    "type": 9,
-    "cashaddr": "bitcoincash:fzltaslh7xnrsxeqm7qtvh0v53n3gfk0v5j0heux4t",
+    "type": 3,
+    "cashaddr": "bitcoincash:rzltaslh7xnrsxeqm7qtvh0v53n3gfk0v5fy6yrcdx",
     "payload": "BEBEC3F7F1A6381B20DF80B65DECA4671426CF65"
   },
   {
@@ -181,8 +181,8 @@
   },
   {
     "payloadSize": 32,
-    "type": 9,
-    "cashaddr": "bitcoincash:fvqqqqqqqqqqqqqqqqqqqqqqzg69v7ysqqqqqqqqqqqqqqqqqqqqqmg26kyv2",
+    "type": 3,
+    "cashaddr": "bitcoincash:rvqqqqqqqqqqqqqqqqqqqqqqzg69v7ysqqqqqqqqqqqqqqqqqqqqqn9alsp2y",
     "payload": "0000000000000000000000000000123456789000000000000000000000000000"
   },
   {
@@ -193,8 +193,8 @@
   },
   {
     "payloadSize": 32,
-    "type": 9,
-    "cashaddr": "bitcoincash:fdzyg3zyg3zyg3zyg3zyg3zyg3zyg3zyg3zyg3zyg3zyg3zyg3zygtvuw7svk",
+    "type": 3,
+    "cashaddr": "bitcoincash:rdzyg3zyg3zyg3zyg3zyg3zyg3zyg3zyg3zyg3zyg3zyg3zyg3zygrpttc42c",
     "payload": "4444444444444444444444444444444444444444444444444444444444444444"
   },
   {
@@ -205,8 +205,8 @@
   },
   {
     "payloadSize": 32,
-    "type": 9,
-    "cashaddr": "bitcoincash:fwyg3zyg3zyg3zyg3zyg3zyg3zyg3zyg3zyg3zyg3zyg3zyg3zygsd0mcdv8x",
+    "type": 3,
+    "cashaddr": "bitcoincash:rwyg3zyg3zyg3zyg3zyg3zyg3zyg3zyg3zyg3zyg3zyg3zyg3zygs9zvatfpg",
     "payload": "8888888888888888888888888888888888888888888888888888888888888888"
   },
   {
@@ -217,8 +217,8 @@
   },
   {
     "payloadSize": 32,
-    "type": 9,
-    "cashaddr": "bitcoincash:f0xvenxvenxvenxvenxvenxvenxvenxvenxvenxvenxvenxvenxvcpyrx20pm",
+    "type": 3,
+    "cashaddr": "bitcoincash:r0xvenxvenxvenxvenxvenxvenxvenxvenxvenxvenxvenxvenxvcff5rv284",
     "payload": "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
   },
   {
@@ -229,8 +229,8 @@
   },
   {
     "payloadSize": 32,
-    "type": 9,
-    "cashaddr": "bitcoincash:f0llllllllllllllllllllllllllllllllllllllllllllllllll7u080gcw3",
+    "type": 3,
+    "cashaddr": "bitcoincash:r0llllllllllllllllllllllllllllllllllllllllllllllllll75zs2wagl",
     "payload": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
   },
   {