From 7854e6824c389ee4514f0511555a93a9269b442c Mon Sep 17 00:00:00 2001
From: Jorge Valdeiglesias <jorge@bitgo.com>
Date: Wed, 15 Jul 2020 10:18:39 -0700
Subject: [PATCH] BG-22830 Update ZEC version and release 1.7.1

Master includes too many untested changes and there is a risk it breaks
other UTXO coins. I'm rebasing on top of the version used in the key-server
and BitGoJS and releasing 1.7.1

TICKET: BG-22830
---
 package.json                           | 2 +-
 src/networks.js                        | 6 ++++--
 test/fixtures/transaction_builder.json | 6 +++---
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index df465d0f..2efbd8c3 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "bitgo-utxo-lib",
-  "version": "1.7.0",
+  "version": "1.7.1",
   "description": "Client-side Bitcoin JavaScript library",
   "main": "./src/index.js",
   "engines": {
diff --git a/src/networks.js b/src/networks.js
index 103d8b5f..722fabf1 100644
--- a/src/networks.js
+++ b/src/networks.js
@@ -92,7 +92,8 @@ module.exports = {
       2: 0x00,
       3: 0x5ba81b19,
       // 4: 0x76b809bb (old Sapling branch id). Blossom branch id becomes effective after block 653600
-      4: 0x2bb40e60
+      // 4: 0x2bb40e60
+      4: 0xf5b9230b
     },
     coin: coins.ZEC
   },
@@ -111,7 +112,8 @@ module.exports = {
       2: 0x00,
       3: 0x5ba81b19,
       // 4: 0x76b809bb (old Sapling branch id)
-      4: 0x2bb40e60
+      // 4: 0x2bb40e60
+      4: 0xf5b9230b
     },
     coin: coins.ZEC
   },
diff --git a/test/fixtures/transaction_builder.json b/test/fixtures/transaction_builder.json
index 57ac2727..b1d15a51 100644
--- a/test/fixtures/transaction_builder.json
+++ b/test/fixtures/transaction_builder.json
@@ -1590,13 +1590,13 @@
                 "pubKeyIndex": 0,
                 "keyPair": "cVmRcxsNdhiCigzrBfpv51JtExBPehtMNzUs9CBvymu1B3ch7LLa",
                 "value": 200000000,
-                "scriptSig": "OP_0 3045022100bf54319205fe0e4bf96458b51bd59e20bcb391049339c1c1085d383ca6e4e38702202a98c2c79f5887e11b792415ad9747a4dadd5ac7c2b32d4c5c75377e07e3279501 OP_0 OP_0 5221021dbb31392fa4857601d5ce2225429923688fede8c2d69e547542cbd88240903a2103c8249e0c474d95e09bb04254d342ef1177f8ca92d2a57356a16df25a4635a5382102fae89068c5c63426f83f0bd5492c4fd757e1f4b575b5d6d05592e8ba519bfd6e53ae"
+                "scriptSig": "OP_0 3045022100e4abb96f9ba029a295c62ca24193036bb3ad8896ef37d6518ad8f41c0fa4848f0220478889b347a0bff6cb1716f170b23bd0f717a73e16dbb2484e4e735c466906eb01 OP_0 OP_0 5221021dbb31392fa4857601d5ce2225429923688fede8c2d69e547542cbd88240903a2103c8249e0c474d95e09bb04254d342ef1177f8ca92d2a57356a16df25a4635a5382102fae89068c5c63426f83f0bd5492c4fd757e1f4b575b5d6d05592e8ba519bfd6e53ae"
               },
               {
                 "pubKeyIndex": 1,
                 "keyPair": "cV2mApzXqoGcGzyoDy5aaiZqQtV5G1HeEuoM1cgpEoiGAeagPeV2",
                 "value": 200000000,
-                "scriptSig": "OP_0 3045022100bf54319205fe0e4bf96458b51bd59e20bcb391049339c1c1085d383ca6e4e38702202a98c2c79f5887e11b792415ad9747a4dadd5ac7c2b32d4c5c75377e07e3279501 304402204f1c773728af94371e3aa2cd5b0d66d717801b21e867fb70678a19d91079aeb502204c77183f51b370ad212471d28696054f1bf93503df16cd4fe8409e41c6f46c6801 OP_0 5221021dbb31392fa4857601d5ce2225429923688fede8c2d69e547542cbd88240903a2103c8249e0c474d95e09bb04254d342ef1177f8ca92d2a57356a16df25a4635a5382102fae89068c5c63426f83f0bd5492c4fd757e1f4b575b5d6d05592e8ba519bfd6e53ae"
+                "scriptSig": "OP_0 3045022100e4abb96f9ba029a295c62ca24193036bb3ad8896ef37d6518ad8f41c0fa4848f0220478889b347a0bff6cb1716f170b23bd0f717a73e16dbb2484e4e735c466906eb01 3044022073f249ee9dcd7fe4eda482dcb3115a68c26aa7ed655706c71f4f953c4484c5c0022049cda74377949a83aafc87144af0c8cd6d740164d9a221f720eec599d1a0d92d01 OP_0 5221021dbb31392fa4857601d5ce2225429923688fede8c2d69e547542cbd88240903a2103c8249e0c474d95e09bb04254d342ef1177f8ca92d2a57356a16df25a4635a5382102fae89068c5c63426f83f0bd5492c4fd757e1f4b575b5d6d05592e8ba519bfd6e53ae"
               }
             ]
           }
@@ -1607,7 +1607,7 @@
             "value": 199999000
           }
         ],
-        "txHex": "0400008085202f8901869b6639512245299696c97bcb579016eaeed39f65fec25471eb5eed86967d1d01000000fdfd0000483045022100bf54319205fe0e4bf96458b51bd59e20bcb391049339c1c1085d383ca6e4e38702202a98c2c79f5887e11b792415ad9747a4dadd5ac7c2b32d4c5c75377e07e327950147304402204f1c773728af94371e3aa2cd5b0d66d717801b21e867fb70678a19d91079aeb502204c77183f51b370ad212471d28696054f1bf93503df16cd4fe8409e41c6f46c68014c695221021dbb31392fa4857601d5ce2225429923688fede8c2d69e547542cbd88240903a2103c8249e0c474d95e09bb04254d342ef1177f8ca92d2a57356a16df25a4635a5382102fae89068c5c63426f83f0bd5492c4fd757e1f4b575b5d6d05592e8ba519bfd6e53aeffffffff0118beeb0b000000001976a91467d674a78a010c82c168718ba42a6bbb1e124af088ac00000000e36a04000000000000000000000000"
+        "txHex": "0400008085202f8901869b6639512245299696c97bcb579016eaeed39f65fec25471eb5eed86967d1d01000000fdfd0000483045022100e4abb96f9ba029a295c62ca24193036bb3ad8896ef37d6518ad8f41c0fa4848f0220478889b347a0bff6cb1716f170b23bd0f717a73e16dbb2484e4e735c466906eb01473044022073f249ee9dcd7fe4eda482dcb3115a68c26aa7ed655706c71f4f953c4484c5c0022049cda74377949a83aafc87144af0c8cd6d740164d9a221f720eec599d1a0d92d014c695221021dbb31392fa4857601d5ce2225429923688fede8c2d69e547542cbd88240903a2103c8249e0c474d95e09bb04254d342ef1177f8ca92d2a57356a16df25a4635a5382102fae89068c5c63426f83f0bd5492c4fd757e1f4b575b5d6d05592e8ba519bfd6e53aeffffffff0118beeb0b000000001976a91467d674a78a010c82c168718ba42a6bbb1e124af088ac00000000e36a04000000000000000000000000"
       },{
         "description": "Zcash P2SH 2-of-3 multisig, signed by key 3 and 1",
         "network": "zcashTest",