From 216825c137d2ac614d9403ea1eac65db2dad4cd2 Mon Sep 17 00:00:00 2001 From: Otto Allmendinger Date: Wed, 3 Jun 2026 17:50:02 +0200 Subject: [PATCH] feat(utxo-lib): add ZEC NU6.2 consensus branch id Zcash NU6.2 activated on mainnet at block 3364600, introducing a new consensus branch id 0x5437f330 (re-enabling Orchard with a corrected circuit after the GHSA-ghc3-g8w4-whf9 emergency soft fork). The builder previously defaulted to NU6.1 (0x4dec4df0), so transactions built for heights >= 3364600 carried a stale branch id and were rejected by upgraded nodes. Add VERSION4/5_BRANCH_NU6_2 markers (457/552) and the 0x5437f330 branch id, wire it through getDefaultConsensusBranchIdForVersion, getDefaultVersionGroupIdForVersion, setPsbtDefaults, and both setDefaultsForVersion switches. Bump the mainnet default build version to NU6.2; testnet stays on NU6.1 because its NU6.2 activation (block 4052000) has not been reached. Regenerate the zcash PSBT signing fixtures: the consensus branch id feeds the transaction sighash, so the serialized PSBTs and signatures change with the new default. Refs: T1-3519 --- modules/utxo-lib/src/bitgo/transaction.ts | 8 ++-- modules/utxo-lib/src/bitgo/zcash/ZcashPsbt.ts | 2 + .../src/bitgo/zcash/ZcashTransaction.ts | 18 ++++++-- .../bitgo/zcash/ZcashTransactionBuilder.ts | 2 + .../psbt/psbt-lite.zcash.fullsigned.json | 20 ++++----- .../psbt/psbt-lite.zcash.halfsigned.json | 10 ++--- .../psbt/psbt-lite.zcash.unsigned.json | 6 +-- .../fixtures/psbt/psbt.zcash.fullsigned.json | 20 ++++----- .../fixtures/psbt/psbt.zcash.halfsigned.json | 10 ++--- .../fixtures/psbt/psbt.zcash.unsigned.json | 6 +-- .../test/bitgo/zcash/consensusBranchId.ts | 45 +++++++++++++++++++ 11 files changed, 104 insertions(+), 43 deletions(-) create mode 100644 modules/utxo-lib/test/bitgo/zcash/consensusBranchId.ts diff --git a/modules/utxo-lib/src/bitgo/transaction.ts b/modules/utxo-lib/src/bitgo/transaction.ts index 1c7d0e040f..6ce2f8811b 100644 --- a/modules/utxo-lib/src/bitgo/transaction.ts +++ b/modules/utxo-lib/src/bitgo/transaction.ts @@ -154,8 +154,8 @@ export function createPsbtFromTransaction(tx: UtxoTransaction, prevOuts: } export function getDefaultTransactionVersion(network: Network): number { - // Use NU6_1 version for both mainnet and testnet - // https://zips.z.cash/zip-0255 + // Mainnet activated NU6.2 at block 3364600; testnet has not (activation 4052000), + // so testnet still builds NU6.1 transactions. if (network === networks.zcashTest) { return ZcashTransaction.VERSION4_BRANCH_NU6_1; } @@ -167,7 +167,7 @@ export function getDefaultTransactionVersion(network: Network): number { case networks.ecash: return 2; case networks.zcash: - return ZcashTransaction.VERSION4_BRANCH_NU6_1; + return ZcashTransaction.VERSION4_BRANCH_NU6_2; default: return 1; } @@ -219,9 +219,11 @@ export function setPsbtDefaults( ZcashTransaction.VERSION4_BRANCH_NU5, ZcashTransaction.VERSION4_BRANCH_NU6, ZcashTransaction.VERSION4_BRANCH_NU6_1, + ZcashTransaction.VERSION4_BRANCH_NU6_2, ZcashTransaction.VERSION5_BRANCH_NU5, ZcashTransaction.VERSION5_BRANCH_NU6, ZcashTransaction.VERSION5_BRANCH_NU6_1, + ZcashTransaction.VERSION5_BRANCH_NU6_2, ].includes(version) ) { throw new Error(`invalid version`); diff --git a/modules/utxo-lib/src/bitgo/zcash/ZcashPsbt.ts b/modules/utxo-lib/src/bitgo/zcash/ZcashPsbt.ts index 2ed2180abd..08927d8a06 100644 --- a/modules/utxo-lib/src/bitgo/zcash/ZcashPsbt.ts +++ b/modules/utxo-lib/src/bitgo/zcash/ZcashPsbt.ts @@ -122,12 +122,14 @@ export class ZcashPsbt extends UtxoPsbt> { case ZcashTransaction.VERSION4_BRANCH_NU5: case ZcashTransaction.VERSION4_BRANCH_NU6: case ZcashTransaction.VERSION4_BRANCH_NU6_1: + case ZcashTransaction.VERSION4_BRANCH_NU6_2: this.setVersion(4); break; case 5: case ZcashTransaction.VERSION5_BRANCH_NU5: case ZcashTransaction.VERSION5_BRANCH_NU6: case ZcashTransaction.VERSION5_BRANCH_NU6_1: + case ZcashTransaction.VERSION5_BRANCH_NU6_2: this.setVersion(5); break; default: diff --git a/modules/utxo-lib/src/bitgo/zcash/ZcashTransaction.ts b/modules/utxo-lib/src/bitgo/zcash/ZcashTransaction.ts index 06073e83e2..f44fdabe66 100644 --- a/modules/utxo-lib/src/bitgo/zcash/ZcashTransaction.ts +++ b/modules/utxo-lib/src/bitgo/zcash/ZcashTransaction.ts @@ -25,6 +25,8 @@ const CANOPY_BRANCH_ID = 0xe9ff75a6; const NU5_BRANCH_ID = 0xc2d6d0b4; const NU6_BRANCH_ID = 0xc8e71055; const NU6_1_BRANCH_ID = 0x4dec4df0; // https://zips.z.cash/zip-0255 +// NU6.2 emergency hard fork re-enabling Orchard with a corrected circuit (mainnet block 3364600). +const NU6_2_BRANCH_ID = 0x5437f330; export class UnsupportedTransactionError extends Error { constructor(message: string) { @@ -38,18 +40,20 @@ export function getDefaultVersionGroupIdForVersion(version: number): number { case 450: case 455: case 456: + case 457: return SAPLING_VERSION_GROUP_ID; case 500: case 550: case 551: + case 552: return ZIP225_VERSION_GROUP_ID; } throw new Error(`no value for version ${version}`); } export function getDefaultConsensusBranchIdForVersion(network: ZcashNetwork, version: number): number { - // Use NU6.1 version for testnet, activated on mainnet in block 2726400 - // https://zips.z.cash/zip-0255 + // Testnet has not yet activated NU6.2 (testnet activation block 4052000), so keep + // defaulting to NU6.1 there. Mainnet activated NU6.2 at block 3364600. if (network === networks.zcashTest) { if (version === 4 || version === 5) { return NU6_1_BRANCH_ID; @@ -74,12 +78,16 @@ export function getDefaultConsensusBranchIdForVersion(network: ZcashNetwork, ver case ZcashTransaction.VERSION5_BRANCH_NU6: // https://zips.z.cash/zip-0253 return NU6_BRANCH_ID; - case 4: - case 5: case ZcashTransaction.VERSION4_BRANCH_NU6_1: case ZcashTransaction.VERSION5_BRANCH_NU6_1: // https://zips.z.cash/zip-0255 return NU6_1_BRANCH_ID; + case 4: + case 5: + case ZcashTransaction.VERSION4_BRANCH_NU6_2: + case ZcashTransaction.VERSION5_BRANCH_NU6_2: + // NU6.2 — emergency hard fork re-enabling Orchard, mainnet block 3364600 + return NU6_2_BRANCH_ID; } throw new Error(`no value for version ${version}`); } @@ -93,9 +101,11 @@ export class ZcashTransaction extends static VERSION4_BRANCH_NU5 = 450; static VERSION4_BRANCH_NU6 = 455; static VERSION4_BRANCH_NU6_1 = 456; + static VERSION4_BRANCH_NU6_2 = 457; static VERSION5_BRANCH_NU5 = 500; static VERSION5_BRANCH_NU6 = 550; static VERSION5_BRANCH_NU6_1 = 551; + static VERSION5_BRANCH_NU6_2 = 552; // 1 if the transaction is post overwinter upgrade, 0 otherwise overwintered = 0; diff --git a/modules/utxo-lib/src/bitgo/zcash/ZcashTransactionBuilder.ts b/modules/utxo-lib/src/bitgo/zcash/ZcashTransactionBuilder.ts index 63b1657a09..90ce9f9df6 100644 --- a/modules/utxo-lib/src/bitgo/zcash/ZcashTransactionBuilder.ts +++ b/modules/utxo-lib/src/bitgo/zcash/ZcashTransactionBuilder.ts @@ -74,12 +74,14 @@ export class ZcashTransactionBuilder e case ZcashTransaction.VERSION4_BRANCH_NU5: case ZcashTransaction.VERSION4_BRANCH_NU6: case ZcashTransaction.VERSION4_BRANCH_NU6_1: + case ZcashTransaction.VERSION4_BRANCH_NU6_2: this.setVersion(4); break; case 5: case ZcashTransaction.VERSION5_BRANCH_NU5: case ZcashTransaction.VERSION5_BRANCH_NU6: case ZcashTransaction.VERSION5_BRANCH_NU6_1: + case ZcashTransaction.VERSION5_BRANCH_NU6_2: this.setVersion(5); break; default: diff --git a/modules/utxo-lib/test/bitgo/fixtures/psbt/psbt-lite.zcash.fullsigned.json b/modules/utxo-lib/test/bitgo/fixtures/psbt/psbt-lite.zcash.fullsigned.json index ecbdc83584..98f068abb5 100644 --- a/modules/utxo-lib/test/bitgo/fixtures/psbt/psbt-lite.zcash.fullsigned.json +++ b/modules/utxo-lib/test/bitgo/fixtures/psbt/psbt-lite.zcash.fullsigned.json @@ -4,16 +4,16 @@ "xprv9s21ZrQH143K2eBLSVNk4zhjDzqzqM29aS9cjr4CcoNrKLYwLHtwgTURSk7RPV3cH9zNZQeR1zGw3MEwSjvARSfWEGpxfaBmduhW3TKsH5g", "xprv9s21ZrQH143K39N9shF9hAsTwh1FvQuBk8UVsZVwr4XtpqF7stCu2LH358NLuqkkK6pu1Af7TJHr5FZERQoLLtnC7wkoM9sdFo1HuP7dWuv" ], - "psbtBase64": "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", - "psbtBase64Finalized": "cHNidP8BAOkEAACAhSAviQLtlQpvo/8G0sIsp8eDS7BnrnsjMczx1I6EegxUdd0ZdQAAAAAA/////xRIluQF4mkl4MdUnXeLV8c3RJljypmea2Gj7i4SmqQYAQAAAAD/////BIQDAAAAAAAAF6kU2QlHRATBJKPQTD+/9h+qSc9DxYuHhAMAAAAAAAAXqRRO/XYem+YcqkIciqxKkCrW8qVLz4eEAwAAAAAAABepFNJNOBa+iiUMvd5+qmdPgBcM2pROhwAAAAAAAAAAEWoPc2V0ZWMgYXN0cm9ub215AAAAAAAAAAAAAAAAAAAAAAAAAE8BBIiyHgAAAAAAAAAAADqSLinwyOsNsqYEhMvctjH2sQfJyq4//c8+fS7B9rzQAxIUhxXzYdq2haZp1CQx5dbT+XNATaucn9G5ULJ5rXY0BMwYrghPAQSIsh4AAAAAAAAAAABtHWVtPd2RwZTARWWjYDcCohAWztFKJl84mC1ideZ7ZAPTusIxOnxrIcuxGxSw0QNB+SLApAOovYyH8NyCDzWvbgT2XNhpTwEEiLIeAAAAAAAAAAAAywT9Y6s02Q/mRmuIDioCzPioYzdDEpka+JEbGqq0QzQDNu8ij/6bjv/7oFLDLTNGYN0fg2bPj+RK5apnK2tikJUE8u8DiQj8BUJJVEdPAATwTexNAAEBINAHAAAAAAAAF6kUVnzXtE+fOgfDE483v5hLYPu68kOHAQf9/QAARzBEAiBisi/0neqf+qzwarSjjqPGVRJ6WIfp2l6a/qQ0lssaKQIgBPhFXdyowVYyUO0I3cEBTtwW9+9sW3cH7n2THglUPHQBSDBFAiEAlUD2H/b3Uaizr2h51KeWKmxfATXCOabdLlxXya/MJ68CIFLY4EvIJRN1FLd7gWTyzK+HF7V8XMRTzkMFTg8Qvn+TAUxpUiED9vQHZL1dY/IAoneIg6z3XpbxUJXJmCY8CHJw0Ml+fn8hA1/7erxwFZ4EafS5iabV4XhaKQQWn/BQsvRo/l09XbvyIQPhUk1/b8V6s+rLtlm3hxBngKR10dtIOVLCMQt+mjiXW1OuAAEBINAHAAAAAAAAF6kUILNwlNgqUTRR/wzNnbI6ugW8XvOHAQdtSDBFAiEA/TZWMNIjbeywlrW/MzQhY5gjVMYOgO5OR3JHSfBkGakCICxFvYsxCmMEz8DxmZkjYZalPo/TVO/d/zQaq9oGAfxlASMhAzbvIo/+m47/+6BSwy0zRmDdH4Nmz4/kSuWqZytrYpCVrAABAGlSIQLMTQ+kEcrCREhvjrLAjgNf90EPRgo1nKf4gQmRvTtCCSEC1y/Q0NkCk0NK1fyhYPJ44DxhRJeqTkJc9FTiwTMPlqshA0TYhBNt9VAgKGX/vGIYx/nIj+bOOclFeYGQuts4p1LxU64iAgLMTQ+kEcrCREhvjrLAjgNf90EPRgo1nKf4gQmRvTtCCRTy7wOJAAAAAAAAAAAAAAAAAAAAACICAtcv0NDZApNDStX8oWDyeOA8YUSXqk5CXPRU4sEzD5arFMwYrggAAAAAAAAAAAAAAAAAAAAAIgIDRNiEE231UCAoZf+8YhjH+ciP5s45yUV5gZC62zinUvEU9lzYaQAAAAAAAAAAAAAAAAAAAAAAAQBpUiEDa3kQtZHTp1bV7nWl6MwOJ+dF6FUw/qvSfU9YR6UPMIYhAq/hLVd9GiCj7a/C/T0lWs59G4sYPQr53T++W/VUOrx9IQNKJrA23w9fA99EdNB5JKmKBeEbolhEduGt20SCrOpAEVOuIgICr+EtV30aIKPtr8L9PSVazn0bixg9CvndP75b9VQ6vH0U1K2DcgAAAAAAAAAAAAAAAAEAAAAiAgNKJrA23w9fA99EdNB5JKmKBeEbolhEduGt20SCrOpAERRAXGW9AAAAAAAAAAAAAAAAAQAAACICA2t5ELWR06dW1e51pejMDifnRehVMP6r0n1PWEelDzCGFFR/RXYAAAAAAAAAAAAAAAABAAAAAAAA", + "psbtBase64": "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", + "psbtBase64Finalized": "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", "inputs": [ { - "hash": "ed950a6fa3ff06d2c22ca7c7834bb067ae7b2331ccf1d48e847a0c5475dd1975", + "hash": "4bc48f52371ae8a886f68e4a9e9417b635e6751f58c38d84591ac357f15cb28c", "index": 0, "sequence": 4294967295 }, { - "hash": "144896e405e26925e0c7549d778b57c737449963ca999e6b61a3ee2e129aa418", + "hash": "48b85379ca34c6f2831bafb3d6cc6c4c7cf040a9068b0f2df7c1d4889fb32486", "index": 1, "sequence": 4294967295 } @@ -28,11 +28,11 @@ "partialSig": [ { "pubkey": "03e1524d7f6fc57ab3eacbb659b787106780a475d1db483952c2310b7e9a38975b", - "signature": "30450221009540f61ff6f751a8b3af6879d4a7962a6c5f0135c239a6dd2e5c57c9afcc27af022052d8e04bc825137514b77b8164f2ccaf8717b57c5cc453ce43054e0f10be7f9301" + "signature": "3045022100d5ea6b5412f60a3e6cd3ed334d63391a76a8c790856473daed421b897801cdd102207269c0d0f23c7846c008401882654440a84c6ee1c2dea012aa20549cefa85d0901" }, { "pubkey": "03f6f40764bd5d63f200a2778883acf75e96f15095c998263c087270d0c97e7e7f", - "signature": "3044022062b22ff49dea9ffaacf06ab4a38ea3c655127a5887e9da5e9afea43496cb1a29022004f8455ddca8c1563250ed08ddc1014edc16f7ef6c5b7707ee7d931e09543c7401" + "signature": "3045022100aa3dc3f88fb3938f477a8f144d23c2f36dbea2824a0dfe4212d262209a713954022007c7b5550b06993c92a874451bc0c922b77294497f064ca61cc217f0ac05151e01" } ], "sighashType": 1, @@ -64,7 +64,7 @@ "partialSig": [ { "pubkey": "0336ef228ffe9b8efffba052c32d334660dd1f8366cf8fe44ae5aa672b6b629095", - "signature": "3045022100fd365630d2236decb096b5bf33342163982354c60e80ee4e47724749f06419a902202c45bd8b310a6304cfc0f19999236196a53e8fd354efddff341aabda0601fc6501" + "signature": "3045022100fc701cbd800adb19f7cb2c26dd773ecb9f8ace86b869a3045bcc0b027ad477d102201a31a56fc7acf61beddb7a9157edab4414e1c8ce92af3b50096e80c9ecb0538401" } ], "sighashType": 1, @@ -78,7 +78,7 @@ "script": "a914567cd7b44f9f3a07c3138f37bf984b60fbbaf24387", "value": "2000" }, - "finalScriptSig": "00473044022062b22ff49dea9ffaacf06ab4a38ea3c655127a5887e9da5e9afea43496cb1a29022004f8455ddca8c1563250ed08ddc1014edc16f7ef6c5b7707ee7d931e09543c74014830450221009540f61ff6f751a8b3af6879d4a7962a6c5f0135c239a6dd2e5c57c9afcc27af022052d8e04bc825137514b77b8164f2ccaf8717b57c5cc453ce43054e0f10be7f93014c69522103f6f40764bd5d63f200a2778883acf75e96f15095c998263c087270d0c97e7e7f21035ffb7abc70159e0469f4b989a6d5e1785a2904169ff050b2f468fe5d3d5dbbf22103e1524d7f6fc57ab3eacbb659b787106780a475d1db483952c2310b7e9a38975b53ae" + "finalScriptSig": "00483045022100aa3dc3f88fb3938f477a8f144d23c2f36dbea2824a0dfe4212d262209a713954022007c7b5550b06993c92a874451bc0c922b77294497f064ca61cc217f0ac05151e01483045022100d5ea6b5412f60a3e6cd3ed334d63391a76a8c790856473daed421b897801cdd102207269c0d0f23c7846c008401882654440a84c6ee1c2dea012aa20549cefa85d09014c69522103f6f40764bd5d63f200a2778883acf75e96f15095c998263c087270d0c97e7e7f21035ffb7abc70159e0469f4b989a6d5e1785a2904169ff050b2f468fe5d3d5dbbf22103e1524d7f6fc57ab3eacbb659b787106780a475d1db483952c2310b7e9a38975b53ae" }, { "type": "p2shP2pk", @@ -86,7 +86,7 @@ "script": "a91420b37094d82a513451ff0ccd9db23aba05bc5ef387", "value": "2000" }, - "finalScriptSig": "483045022100fd365630d2236decb096b5bf33342163982354c60e80ee4e47724749f06419a902202c45bd8b310a6304cfc0f19999236196a53e8fd354efddff341aabda0601fc650123210336ef228ffe9b8efffba052c32d334660dd1f8366cf8fe44ae5aa672b6b629095ac" + "finalScriptSig": "483045022100fc701cbd800adb19f7cb2c26dd773ecb9f8ace86b869a3045bcc0b027ad477d102201a31a56fc7acf61beddb7a9157edab4414e1c8ce92af3b50096e80c9ecb053840123210336ef228ffe9b8efffba052c32d334660dd1f8366cf8fe44ae5aa672b6b629095ac" } ], "outputs": [ @@ -151,5 +151,5 @@ {}, {} ], - "extractedTransaction": "0400008085202f8902ed950a6fa3ff06d2c22ca7c7834bb067ae7b2331ccf1d48e847a0c5475dd197500000000fdfd0000473044022062b22ff49dea9ffaacf06ab4a38ea3c655127a5887e9da5e9afea43496cb1a29022004f8455ddca8c1563250ed08ddc1014edc16f7ef6c5b7707ee7d931e09543c74014830450221009540f61ff6f751a8b3af6879d4a7962a6c5f0135c239a6dd2e5c57c9afcc27af022052d8e04bc825137514b77b8164f2ccaf8717b57c5cc453ce43054e0f10be7f93014c69522103f6f40764bd5d63f200a2778883acf75e96f15095c998263c087270d0c97e7e7f21035ffb7abc70159e0469f4b989a6d5e1785a2904169ff050b2f468fe5d3d5dbbf22103e1524d7f6fc57ab3eacbb659b787106780a475d1db483952c2310b7e9a38975b53aeffffffff144896e405e26925e0c7549d778b57c737449963ca999e6b61a3ee2e129aa418010000006d483045022100fd365630d2236decb096b5bf33342163982354c60e80ee4e47724749f06419a902202c45bd8b310a6304cfc0f19999236196a53e8fd354efddff341aabda0601fc650123210336ef228ffe9b8efffba052c32d334660dd1f8366cf8fe44ae5aa672b6b629095acffffffff04840300000000000017a914d909474404c124a3d04c3fbff61faa49cf43c58b87840300000000000017a9144efd761e9be61caa421c8aac4a902ad6f2a54bcf87840300000000000017a914d24d3816be8a250cbdde7eaa674f80170cda944e870000000000000000116a0f736574656320617374726f6e6f6d7900000000000000000000000000000000000000" + "extractedTransaction": "0400008085202f89024bc48f52371ae8a886f68e4a9e9417b635e6751f58c38d84591ac357f15cb28c00000000fdfe0000483045022100aa3dc3f88fb3938f477a8f144d23c2f36dbea2824a0dfe4212d262209a713954022007c7b5550b06993c92a874451bc0c922b77294497f064ca61cc217f0ac05151e01483045022100d5ea6b5412f60a3e6cd3ed334d63391a76a8c790856473daed421b897801cdd102207269c0d0f23c7846c008401882654440a84c6ee1c2dea012aa20549cefa85d09014c69522103f6f40764bd5d63f200a2778883acf75e96f15095c998263c087270d0c97e7e7f21035ffb7abc70159e0469f4b989a6d5e1785a2904169ff050b2f468fe5d3d5dbbf22103e1524d7f6fc57ab3eacbb659b787106780a475d1db483952c2310b7e9a38975b53aeffffffff48b85379ca34c6f2831bafb3d6cc6c4c7cf040a9068b0f2df7c1d4889fb32486010000006d483045022100fc701cbd800adb19f7cb2c26dd773ecb9f8ace86b869a3045bcc0b027ad477d102201a31a56fc7acf61beddb7a9157edab4414e1c8ce92af3b50096e80c9ecb053840123210336ef228ffe9b8efffba052c32d334660dd1f8366cf8fe44ae5aa672b6b629095acffffffff04840300000000000017a914d909474404c124a3d04c3fbff61faa49cf43c58b87840300000000000017a9144efd761e9be61caa421c8aac4a902ad6f2a54bcf87840300000000000017a914d24d3816be8a250cbdde7eaa674f80170cda944e870000000000000000116a0f736574656320617374726f6e6f6d7900000000000000000000000000000000000000" } diff --git a/modules/utxo-lib/test/bitgo/fixtures/psbt/psbt-lite.zcash.halfsigned.json b/modules/utxo-lib/test/bitgo/fixtures/psbt/psbt-lite.zcash.halfsigned.json index cad8362a60..342b19848a 100644 --- a/modules/utxo-lib/test/bitgo/fixtures/psbt/psbt-lite.zcash.halfsigned.json +++ b/modules/utxo-lib/test/bitgo/fixtures/psbt/psbt-lite.zcash.halfsigned.json @@ -4,16 +4,16 @@ "xprv9s21ZrQH143K2eBLSVNk4zhjDzqzqM29aS9cjr4CcoNrKLYwLHtwgTURSk7RPV3cH9zNZQeR1zGw3MEwSjvARSfWEGpxfaBmduhW3TKsH5g", "xprv9s21ZrQH143K39N9shF9hAsTwh1FvQuBk8UVsZVwr4XtpqF7stCu2LH358NLuqkkK6pu1Af7TJHr5FZERQoLLtnC7wkoM9sdFo1HuP7dWuv" ], - "psbtBase64": "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", + "psbtBase64": "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", "psbtBase64Finalized": null, "inputs": [ { - "hash": "ed950a6fa3ff06d2c22ca7c7834bb067ae7b2331ccf1d48e847a0c5475dd1975", + "hash": "4bc48f52371ae8a886f68e4a9e9417b635e6751f58c38d84591ac357f15cb28c", "index": 0, "sequence": 4294967295 }, { - "hash": "144896e405e26925e0c7549d778b57c737449963ca999e6b61a3ee2e129aa418", + "hash": "48b85379ca34c6f2831bafb3d6cc6c4c7cf040a9068b0f2df7c1d4889fb32486", "index": 1, "sequence": 4294967295 } @@ -28,7 +28,7 @@ "partialSig": [ { "pubkey": "03f6f40764bd5d63f200a2778883acf75e96f15095c998263c087270d0c97e7e7f", - "signature": "3044022062b22ff49dea9ffaacf06ab4a38ea3c655127a5887e9da5e9afea43496cb1a29022004f8455ddca8c1563250ed08ddc1014edc16f7ef6c5b7707ee7d931e09543c7401" + "signature": "3045022100aa3dc3f88fb3938f477a8f144d23c2f36dbea2824a0dfe4212d262209a713954022007c7b5550b06993c92a874451bc0c922b77294497f064ca61cc217f0ac05151e01" } ], "sighashType": 1, @@ -60,7 +60,7 @@ "partialSig": [ { "pubkey": "0336ef228ffe9b8efffba052c32d334660dd1f8366cf8fe44ae5aa672b6b629095", - "signature": "3045022100fd365630d2236decb096b5bf33342163982354c60e80ee4e47724749f06419a902202c45bd8b310a6304cfc0f19999236196a53e8fd354efddff341aabda0601fc6501" + "signature": "3045022100fc701cbd800adb19f7cb2c26dd773ecb9f8ace86b869a3045bcc0b027ad477d102201a31a56fc7acf61beddb7a9157edab4414e1c8ce92af3b50096e80c9ecb0538401" } ], "sighashType": 1, diff --git a/modules/utxo-lib/test/bitgo/fixtures/psbt/psbt-lite.zcash.unsigned.json b/modules/utxo-lib/test/bitgo/fixtures/psbt/psbt-lite.zcash.unsigned.json index a0e30c2878..48461f2b0d 100644 --- a/modules/utxo-lib/test/bitgo/fixtures/psbt/psbt-lite.zcash.unsigned.json +++ b/modules/utxo-lib/test/bitgo/fixtures/psbt/psbt-lite.zcash.unsigned.json @@ -4,16 +4,16 @@ "xprv9s21ZrQH143K2eBLSVNk4zhjDzqzqM29aS9cjr4CcoNrKLYwLHtwgTURSk7RPV3cH9zNZQeR1zGw3MEwSjvARSfWEGpxfaBmduhW3TKsH5g", "xprv9s21ZrQH143K39N9shF9hAsTwh1FvQuBk8UVsZVwr4XtpqF7stCu2LH358NLuqkkK6pu1Af7TJHr5FZERQoLLtnC7wkoM9sdFo1HuP7dWuv" ], - "psbtBase64": "cHNidP8BAOkEAACAhSAviQLtlQpvo/8G0sIsp8eDS7BnrnsjMczx1I6EegxUdd0ZdQAAAAAA/////xRIluQF4mkl4MdUnXeLV8c3RJljypmea2Gj7i4SmqQYAQAAAAD/////BIQDAAAAAAAAF6kU2QlHRATBJKPQTD+/9h+qSc9DxYuHhAMAAAAAAAAXqRRO/XYem+YcqkIciqxKkCrW8qVLz4eEAwAAAAAAABepFNJNOBa+iiUMvd5+qmdPgBcM2pROhwAAAAAAAAAAEWoPc2V0ZWMgYXN0cm9ub215AAAAAAAAAAAAAAAAAAAAAAAAAE8BBIiyHgAAAAAAAAAAADqSLinwyOsNsqYEhMvctjH2sQfJyq4//c8+fS7B9rzQAxIUhxXzYdq2haZp1CQx5dbT+XNATaucn9G5ULJ5rXY0BMwYrghPAQSIsh4AAAAAAAAAAABtHWVtPd2RwZTARWWjYDcCohAWztFKJl84mC1ideZ7ZAPTusIxOnxrIcuxGxSw0QNB+SLApAOovYyH8NyCDzWvbgT2XNhpTwEEiLIeAAAAAAAAAAAAywT9Y6s02Q/mRmuIDioCzPioYzdDEpka+JEbGqq0QzQDNu8ij/6bjv/7oFLDLTNGYN0fg2bPj+RK5apnK2tikJUE8u8DiQj8BUJJVEdPAATwTexNAAEBINAHAAAAAAAAF6kUVnzXtE+fOgfDE483v5hLYPu68kOHAQMEAQAAAAEEaVIhA/b0B2S9XWPyAKJ3iIOs916W8VCVyZgmPAhycNDJfn5/IQNf+3q8cBWeBGn0uYmm1eF4WikEFp/wULL0aP5dPV278iED4VJNf2/FerPqy7ZZt4cQZ4CkddHbSDlSwjELfpo4l1tTriIGA1/7erxwFZ4EafS5iabV4XhaKQQWn/BQsvRo/l09XbvyFMwYrggAAAAAAAAAAAEAAAAAAAAAIgYD4VJNf2/FerPqy7ZZt4cQZ4CkddHbSDlSwjELfpo4l1sU9lzYaQAAAAAAAAAAAQAAAAAAAAAiBgP29AdkvV1j8gCid4iDrPdelvFQlcmYJjwIcnDQyX5+fxTy7wOJAAAAAAAAAAABAAAAAAAAAAABASDQBwAAAAAAABepFCCzcJTYKlE0Uf8MzZ2yOroFvF7zhwEDBAEAAAABBCMhAzbvIo/+m47/+6BSwy0zRmDdH4Nmz4/kSuWqZytrYpCVrAABAGlSIQLMTQ+kEcrCREhvjrLAjgNf90EPRgo1nKf4gQmRvTtCCSEC1y/Q0NkCk0NK1fyhYPJ44DxhRJeqTkJc9FTiwTMPlqshA0TYhBNt9VAgKGX/vGIYx/nIj+bOOclFeYGQuts4p1LxU64iAgLMTQ+kEcrCREhvjrLAjgNf90EPRgo1nKf4gQmRvTtCCRTy7wOJAAAAAAAAAAAAAAAAAAAAACICAtcv0NDZApNDStX8oWDyeOA8YUSXqk5CXPRU4sEzD5arFMwYrggAAAAAAAAAAAAAAAAAAAAAIgIDRNiEE231UCAoZf+8YhjH+ciP5s45yUV5gZC62zinUvEU9lzYaQAAAAAAAAAAAAAAAAAAAAAAAQBpUiEDa3kQtZHTp1bV7nWl6MwOJ+dF6FUw/qvSfU9YR6UPMIYhAq/hLVd9GiCj7a/C/T0lWs59G4sYPQr53T++W/VUOrx9IQNKJrA23w9fA99EdNB5JKmKBeEbolhEduGt20SCrOpAEVOuIgICr+EtV30aIKPtr8L9PSVazn0bixg9CvndP75b9VQ6vH0U1K2DcgAAAAAAAAAAAAAAAAEAAAAiAgNKJrA23w9fA99EdNB5JKmKBeEbolhEduGt20SCrOpAERRAXGW9AAAAAAAAAAAAAAAAAQAAACICA2t5ELWR06dW1e51pejMDifnRehVMP6r0n1PWEelDzCGFFR/RXYAAAAAAAAAAAAAAAABAAAAAAAA", + "psbtBase64": "cHNidP8BAOkEAACAhSAviQJLxI9SNxroqIb2jkqelBe2NeZ1H1jDjYRZGsNX8VyyjAAAAAAA/////0i4U3nKNMbygxuvs9bMbEx88ECpBosPLffB1IifsySGAQAAAAD/////BIQDAAAAAAAAF6kU2QlHRATBJKPQTD+/9h+qSc9DxYuHhAMAAAAAAAAXqRRO/XYem+YcqkIciqxKkCrW8qVLz4eEAwAAAAAAABepFNJNOBa+iiUMvd5+qmdPgBcM2pROhwAAAAAAAAAAEWoPc2V0ZWMgYXN0cm9ub215AAAAAAAAAAAAAAAAAAAAAAAAAE8BBIiyHgAAAAAAAAAAADqSLinwyOsNsqYEhMvctjH2sQfJyq4//c8+fS7B9rzQAxIUhxXzYdq2haZp1CQx5dbT+XNATaucn9G5ULJ5rXY0BMwYrghPAQSIsh4AAAAAAAAAAABtHWVtPd2RwZTARWWjYDcCohAWztFKJl84mC1ideZ7ZAPTusIxOnxrIcuxGxSw0QNB+SLApAOovYyH8NyCDzWvbgT2XNhpTwEEiLIeAAAAAAAAAAAAywT9Y6s02Q/mRmuIDioCzPioYzdDEpka+JEbGqq0QzQDNu8ij/6bjv/7oFLDLTNGYN0fg2bPj+RK5apnK2tikJUE8u8DiQj8BUJJVEdPAAQw8zdUAAEBINAHAAAAAAAAF6kUVnzXtE+fOgfDE483v5hLYPu68kOHAQMEAQAAAAEEaVIhA/b0B2S9XWPyAKJ3iIOs916W8VCVyZgmPAhycNDJfn5/IQNf+3q8cBWeBGn0uYmm1eF4WikEFp/wULL0aP5dPV278iED4VJNf2/FerPqy7ZZt4cQZ4CkddHbSDlSwjELfpo4l1tTriIGA1/7erxwFZ4EafS5iabV4XhaKQQWn/BQsvRo/l09XbvyFMwYrggAAAAAAAAAAAEAAAAAAAAAIgYD4VJNf2/FerPqy7ZZt4cQZ4CkddHbSDlSwjELfpo4l1sU9lzYaQAAAAAAAAAAAQAAAAAAAAAiBgP29AdkvV1j8gCid4iDrPdelvFQlcmYJjwIcnDQyX5+fxTy7wOJAAAAAAAAAAABAAAAAAAAAAABASDQBwAAAAAAABepFCCzcJTYKlE0Uf8MzZ2yOroFvF7zhwEDBAEAAAABBCMhAzbvIo/+m47/+6BSwy0zRmDdH4Nmz4/kSuWqZytrYpCVrAABAGlSIQLMTQ+kEcrCREhvjrLAjgNf90EPRgo1nKf4gQmRvTtCCSEC1y/Q0NkCk0NK1fyhYPJ44DxhRJeqTkJc9FTiwTMPlqshA0TYhBNt9VAgKGX/vGIYx/nIj+bOOclFeYGQuts4p1LxU64iAgLMTQ+kEcrCREhvjrLAjgNf90EPRgo1nKf4gQmRvTtCCRTy7wOJAAAAAAAAAAAAAAAAAAAAACICAtcv0NDZApNDStX8oWDyeOA8YUSXqk5CXPRU4sEzD5arFMwYrggAAAAAAAAAAAAAAAAAAAAAIgIDRNiEE231UCAoZf+8YhjH+ciP5s45yUV5gZC62zinUvEU9lzYaQAAAAAAAAAAAAAAAAAAAAAAAQBpUiEDa3kQtZHTp1bV7nWl6MwOJ+dF6FUw/qvSfU9YR6UPMIYhAq/hLVd9GiCj7a/C/T0lWs59G4sYPQr53T++W/VUOrx9IQNKJrA23w9fA99EdNB5JKmKBeEbolhEduGt20SCrOpAEVOuIgICr+EtV30aIKPtr8L9PSVazn0bixg9CvndP75b9VQ6vH0U1K2DcgAAAAAAAAAAAAAAAAEAAAAiAgNKJrA23w9fA99EdNB5JKmKBeEbolhEduGt20SCrOpAERRAXGW9AAAAAAAAAAAAAAAAAQAAACICA2t5ELWR06dW1e51pejMDifnRehVMP6r0n1PWEelDzCGFFR/RXYAAAAAAAAAAAAAAAABAAAAAAAA", "psbtBase64Finalized": null, "inputs": [ { - "hash": "ed950a6fa3ff06d2c22ca7c7834bb067ae7b2331ccf1d48e847a0c5475dd1975", + "hash": "4bc48f52371ae8a886f68e4a9e9417b635e6751f58c38d84591ac357f15cb28c", "index": 0, "sequence": 4294967295 }, { - "hash": "144896e405e26925e0c7549d778b57c737449963ca999e6b61a3ee2e129aa418", + "hash": "48b85379ca34c6f2831bafb3d6cc6c4c7cf040a9068b0f2df7c1d4889fb32486", "index": 1, "sequence": 4294967295 } diff --git a/modules/utxo-lib/test/bitgo/fixtures/psbt/psbt.zcash.fullsigned.json b/modules/utxo-lib/test/bitgo/fixtures/psbt/psbt.zcash.fullsigned.json index de67d8b5b3..2c1867f22e 100644 --- a/modules/utxo-lib/test/bitgo/fixtures/psbt/psbt.zcash.fullsigned.json +++ b/modules/utxo-lib/test/bitgo/fixtures/psbt/psbt.zcash.fullsigned.json @@ -4,16 +4,16 @@ "xprv9s21ZrQH143K2eBLSVNk4zhjDzqzqM29aS9cjr4CcoNrKLYwLHtwgTURSk7RPV3cH9zNZQeR1zGw3MEwSjvARSfWEGpxfaBmduhW3TKsH5g", "xprv9s21ZrQH143K39N9shF9hAsTwh1FvQuBk8UVsZVwr4XtpqF7stCu2LH358NLuqkkK6pu1Af7TJHr5FZERQoLLtnC7wkoM9sdFo1HuP7dWuv" ], - "psbtBase64": "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", - "psbtBase64Finalized": "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", + "psbtBase64": "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", + "psbtBase64Finalized": "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", "inputs": [ { - "hash": "ed950a6fa3ff06d2c22ca7c7834bb067ae7b2331ccf1d48e847a0c5475dd1975", + "hash": "4bc48f52371ae8a886f68e4a9e9417b635e6751f58c38d84591ac357f15cb28c", "index": 0, "sequence": 4294967295 }, { - "hash": "144896e405e26925e0c7549d778b57c737449963ca999e6b61a3ee2e129aa418", + "hash": "48b85379ca34c6f2831bafb3d6cc6c4c7cf040a9068b0f2df7c1d4889fb32486", "index": 1, "sequence": 4294967295 } @@ -48,11 +48,11 @@ "partialSig": [ { "pubkey": "03f6f40764bd5d63f200a2778883acf75e96f15095c998263c087270d0c97e7e7f", - "signature": "3044022062b22ff49dea9ffaacf06ab4a38ea3c655127a5887e9da5e9afea43496cb1a29022004f8455ddca8c1563250ed08ddc1014edc16f7ef6c5b7707ee7d931e09543c7401" + "signature": "3045022100aa3dc3f88fb3938f477a8f144d23c2f36dbea2824a0dfe4212d262209a713954022007c7b5550b06993c92a874451bc0c922b77294497f064ca61cc217f0ac05151e01" }, { "pubkey": "03e1524d7f6fc57ab3eacbb659b787106780a475d1db483952c2310b7e9a38975b", - "signature": "30450221009540f61ff6f751a8b3af6879d4a7962a6c5f0135c239a6dd2e5c57c9afcc27af022052d8e04bc825137514b77b8164f2ccaf8717b57c5cc453ce43054e0f10be7f9301" + "signature": "3045022100d5ea6b5412f60a3e6cd3ed334d63391a76a8c790856473daed421b897801cdd102207269c0d0f23c7846c008401882654440a84c6ee1c2dea012aa20549cefa85d0901" } ] }, @@ -68,7 +68,7 @@ "partialSig": [ { "pubkey": "0336ef228ffe9b8efffba052c32d334660dd1f8366cf8fe44ae5aa672b6b629095", - "signature": "3045022100fd365630d2236decb096b5bf33342163982354c60e80ee4e47724749f06419a902202c45bd8b310a6304cfc0f19999236196a53e8fd354efddff341aabda0601fc6501" + "signature": "3045022100fc701cbd800adb19f7cb2c26dd773ecb9f8ace86b869a3045bcc0b027ad477d102201a31a56fc7acf61beddb7a9157edab4414e1c8ce92af3b50096e80c9ecb0538401" } ] } @@ -80,7 +80,7 @@ "script": "a914567cd7b44f9f3a07c3138f37bf984b60fbbaf24387", "value": "2000" }, - "finalScriptSig": "00473044022062b22ff49dea9ffaacf06ab4a38ea3c655127a5887e9da5e9afea43496cb1a29022004f8455ddca8c1563250ed08ddc1014edc16f7ef6c5b7707ee7d931e09543c74014830450221009540f61ff6f751a8b3af6879d4a7962a6c5f0135c239a6dd2e5c57c9afcc27af022052d8e04bc825137514b77b8164f2ccaf8717b57c5cc453ce43054e0f10be7f93014c69522103f6f40764bd5d63f200a2778883acf75e96f15095c998263c087270d0c97e7e7f21035ffb7abc70159e0469f4b989a6d5e1785a2904169ff050b2f468fe5d3d5dbbf22103e1524d7f6fc57ab3eacbb659b787106780a475d1db483952c2310b7e9a38975b53ae" + "finalScriptSig": "00483045022100aa3dc3f88fb3938f477a8f144d23c2f36dbea2824a0dfe4212d262209a713954022007c7b5550b06993c92a874451bc0c922b77294497f064ca61cc217f0ac05151e01483045022100d5ea6b5412f60a3e6cd3ed334d63391a76a8c790856473daed421b897801cdd102207269c0d0f23c7846c008401882654440a84c6ee1c2dea012aa20549cefa85d09014c69522103f6f40764bd5d63f200a2778883acf75e96f15095c998263c087270d0c97e7e7f21035ffb7abc70159e0469f4b989a6d5e1785a2904169ff050b2f468fe5d3d5dbbf22103e1524d7f6fc57ab3eacbb659b787106780a475d1db483952c2310b7e9a38975b53ae" }, { "type": "p2shP2pk", @@ -88,7 +88,7 @@ "script": "a91420b37094d82a513451ff0ccd9db23aba05bc5ef387", "value": "2000" }, - "finalScriptSig": "483045022100fd365630d2236decb096b5bf33342163982354c60e80ee4e47724749f06419a902202c45bd8b310a6304cfc0f19999236196a53e8fd354efddff341aabda0601fc650123210336ef228ffe9b8efffba052c32d334660dd1f8366cf8fe44ae5aa672b6b629095ac" + "finalScriptSig": "483045022100fc701cbd800adb19f7cb2c26dd773ecb9f8ace86b869a3045bcc0b027ad477d102201a31a56fc7acf61beddb7a9157edab4414e1c8ce92af3b50096e80c9ecb053840123210336ef228ffe9b8efffba052c32d334660dd1f8366cf8fe44ae5aa672b6b629095ac" } ], "outputs": [ @@ -159,5 +159,5 @@ "unknownKeyVals": [] } ], - "extractedTransaction": "0400008085202f8902ed950a6fa3ff06d2c22ca7c7834bb067ae7b2331ccf1d48e847a0c5475dd197500000000fdfd0000473044022062b22ff49dea9ffaacf06ab4a38ea3c655127a5887e9da5e9afea43496cb1a29022004f8455ddca8c1563250ed08ddc1014edc16f7ef6c5b7707ee7d931e09543c74014830450221009540f61ff6f751a8b3af6879d4a7962a6c5f0135c239a6dd2e5c57c9afcc27af022052d8e04bc825137514b77b8164f2ccaf8717b57c5cc453ce43054e0f10be7f93014c69522103f6f40764bd5d63f200a2778883acf75e96f15095c998263c087270d0c97e7e7f21035ffb7abc70159e0469f4b989a6d5e1785a2904169ff050b2f468fe5d3d5dbbf22103e1524d7f6fc57ab3eacbb659b787106780a475d1db483952c2310b7e9a38975b53aeffffffff144896e405e26925e0c7549d778b57c737449963ca999e6b61a3ee2e129aa418010000006d483045022100fd365630d2236decb096b5bf33342163982354c60e80ee4e47724749f06419a902202c45bd8b310a6304cfc0f19999236196a53e8fd354efddff341aabda0601fc650123210336ef228ffe9b8efffba052c32d334660dd1f8366cf8fe44ae5aa672b6b629095acffffffff04840300000000000017a914d909474404c124a3d04c3fbff61faa49cf43c58b87840300000000000017a9144efd761e9be61caa421c8aac4a902ad6f2a54bcf87840300000000000017a914d24d3816be8a250cbdde7eaa674f80170cda944e870000000000000000116a0f736574656320617374726f6e6f6d7900000000000000000000000000000000000000" + "extractedTransaction": "0400008085202f89024bc48f52371ae8a886f68e4a9e9417b635e6751f58c38d84591ac357f15cb28c00000000fdfe0000483045022100aa3dc3f88fb3938f477a8f144d23c2f36dbea2824a0dfe4212d262209a713954022007c7b5550b06993c92a874451bc0c922b77294497f064ca61cc217f0ac05151e01483045022100d5ea6b5412f60a3e6cd3ed334d63391a76a8c790856473daed421b897801cdd102207269c0d0f23c7846c008401882654440a84c6ee1c2dea012aa20549cefa85d09014c69522103f6f40764bd5d63f200a2778883acf75e96f15095c998263c087270d0c97e7e7f21035ffb7abc70159e0469f4b989a6d5e1785a2904169ff050b2f468fe5d3d5dbbf22103e1524d7f6fc57ab3eacbb659b787106780a475d1db483952c2310b7e9a38975b53aeffffffff48b85379ca34c6f2831bafb3d6cc6c4c7cf040a9068b0f2df7c1d4889fb32486010000006d483045022100fc701cbd800adb19f7cb2c26dd773ecb9f8ace86b869a3045bcc0b027ad477d102201a31a56fc7acf61beddb7a9157edab4414e1c8ce92af3b50096e80c9ecb053840123210336ef228ffe9b8efffba052c32d334660dd1f8366cf8fe44ae5aa672b6b629095acffffffff04840300000000000017a914d909474404c124a3d04c3fbff61faa49cf43c58b87840300000000000017a9144efd761e9be61caa421c8aac4a902ad6f2a54bcf87840300000000000017a914d24d3816be8a250cbdde7eaa674f80170cda944e870000000000000000116a0f736574656320617374726f6e6f6d7900000000000000000000000000000000000000" } diff --git a/modules/utxo-lib/test/bitgo/fixtures/psbt/psbt.zcash.halfsigned.json b/modules/utxo-lib/test/bitgo/fixtures/psbt/psbt.zcash.halfsigned.json index 24a09a6d38..7851f6e1b3 100644 --- a/modules/utxo-lib/test/bitgo/fixtures/psbt/psbt.zcash.halfsigned.json +++ b/modules/utxo-lib/test/bitgo/fixtures/psbt/psbt.zcash.halfsigned.json @@ -4,16 +4,16 @@ "xprv9s21ZrQH143K2eBLSVNk4zhjDzqzqM29aS9cjr4CcoNrKLYwLHtwgTURSk7RPV3cH9zNZQeR1zGw3MEwSjvARSfWEGpxfaBmduhW3TKsH5g", "xprv9s21ZrQH143K39N9shF9hAsTwh1FvQuBk8UVsZVwr4XtpqF7stCu2LH358NLuqkkK6pu1Af7TJHr5FZERQoLLtnC7wkoM9sdFo1HuP7dWuv" ], - "psbtBase64": "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", + "psbtBase64": "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", "psbtBase64Finalized": null, "inputs": [ { - "hash": "ed950a6fa3ff06d2c22ca7c7834bb067ae7b2331ccf1d48e847a0c5475dd1975", + "hash": "4bc48f52371ae8a886f68e4a9e9417b635e6751f58c38d84591ac357f15cb28c", "index": 0, "sequence": 4294967295 }, { - "hash": "144896e405e26925e0c7549d778b57c737449963ca999e6b61a3ee2e129aa418", + "hash": "48b85379ca34c6f2831bafb3d6cc6c4c7cf040a9068b0f2df7c1d4889fb32486", "index": 1, "sequence": 4294967295 } @@ -48,7 +48,7 @@ "partialSig": [ { "pubkey": "03f6f40764bd5d63f200a2778883acf75e96f15095c998263c087270d0c97e7e7f", - "signature": "3044022062b22ff49dea9ffaacf06ab4a38ea3c655127a5887e9da5e9afea43496cb1a29022004f8455ddca8c1563250ed08ddc1014edc16f7ef6c5b7707ee7d931e09543c7401" + "signature": "3045022100aa3dc3f88fb3938f477a8f144d23c2f36dbea2824a0dfe4212d262209a713954022007c7b5550b06993c92a874451bc0c922b77294497f064ca61cc217f0ac05151e01" } ] }, @@ -64,7 +64,7 @@ "partialSig": [ { "pubkey": "0336ef228ffe9b8efffba052c32d334660dd1f8366cf8fe44ae5aa672b6b629095", - "signature": "3045022100fd365630d2236decb096b5bf33342163982354c60e80ee4e47724749f06419a902202c45bd8b310a6304cfc0f19999236196a53e8fd354efddff341aabda0601fc6501" + "signature": "3045022100fc701cbd800adb19f7cb2c26dd773ecb9f8ace86b869a3045bcc0b027ad477d102201a31a56fc7acf61beddb7a9157edab4414e1c8ce92af3b50096e80c9ecb0538401" } ] } diff --git a/modules/utxo-lib/test/bitgo/fixtures/psbt/psbt.zcash.unsigned.json b/modules/utxo-lib/test/bitgo/fixtures/psbt/psbt.zcash.unsigned.json index ed71ff41a2..7099a92682 100644 --- a/modules/utxo-lib/test/bitgo/fixtures/psbt/psbt.zcash.unsigned.json +++ b/modules/utxo-lib/test/bitgo/fixtures/psbt/psbt.zcash.unsigned.json @@ -4,16 +4,16 @@ "xprv9s21ZrQH143K2eBLSVNk4zhjDzqzqM29aS9cjr4CcoNrKLYwLHtwgTURSk7RPV3cH9zNZQeR1zGw3MEwSjvARSfWEGpxfaBmduhW3TKsH5g", "xprv9s21ZrQH143K39N9shF9hAsTwh1FvQuBk8UVsZVwr4XtpqF7stCu2LH358NLuqkkK6pu1Af7TJHr5FZERQoLLtnC7wkoM9sdFo1HuP7dWuv" ], - "psbtBase64": "cHNidP8BAOkEAACAhSAviQLtlQpvo/8G0sIsp8eDS7BnrnsjMczx1I6EegxUdd0ZdQAAAAAA/////xRIluQF4mkl4MdUnXeLV8c3RJljypmea2Gj7i4SmqQYAQAAAAD/////BIQDAAAAAAAAF6kU2QlHRATBJKPQTD+/9h+qSc9DxYuHhAMAAAAAAAAXqRRO/XYem+YcqkIciqxKkCrW8qVLz4eEAwAAAAAAABepFNJNOBa+iiUMvd5+qmdPgBcM2pROhwAAAAAAAAAAEWoPc2V0ZWMgYXN0cm9ub215AAAAAAAAAAAAAAAAAAAAAAAAAE8BBIiyHgAAAAAAAAAAADqSLinwyOsNsqYEhMvctjH2sQfJyq4//c8+fS7B9rzQAxIUhxXzYdq2haZp1CQx5dbT+XNATaucn9G5ULJ5rXY0BMwYrghPAQSIsh4AAAAAAAAAAABtHWVtPd2RwZTARWWjYDcCohAWztFKJl84mC1ideZ7ZAPTusIxOnxrIcuxGxSw0QNB+SLApAOovYyH8NyCDzWvbgT2XNhpTwEEiLIeAAAAAAAAAAAAywT9Y6s02Q/mRmuIDioCzPioYzdDEpka+JEbGqq0QzQDNu8ij/6bjv/7oFLDLTNGYN0fg2bPj+RK5apnK2tikJUE8u8DiQj8BUJJVEdPAATwTexNAAEBINAHAAAAAAAAF6kUVnzXtE+fOgfDE483v5hLYPu68kOHAQMEAQAAAAEEaVIhA/b0B2S9XWPyAKJ3iIOs916W8VCVyZgmPAhycNDJfn5/IQNf+3q8cBWeBGn0uYmm1eF4WikEFp/wULL0aP5dPV278iED4VJNf2/FerPqy7ZZt4cQZ4CkddHbSDlSwjELfpo4l1tTriIGA1/7erxwFZ4EafS5iabV4XhaKQQWn/BQsvRo/l09XbvyFMwYrggAAAAAAAAAAAEAAAAAAAAAIgYD4VJNf2/FerPqy7ZZt4cQZ4CkddHbSDlSwjELfpo4l1sU9lzYaQAAAAAAAAAAAQAAAAAAAAAiBgP29AdkvV1j8gCid4iDrPdelvFQlcmYJjwIcnDQyX5+fxTy7wOJAAAAAAAAAAABAAAAAAAAAAABASDQBwAAAAAAABepFCCzcJTYKlE0Uf8MzZ2yOroFvF7zhwEDBAEAAAABBCMhAzbvIo/+m47/+6BSwy0zRmDdH4Nmz4/kSuWqZytrYpCVrAABAGlSIQLMTQ+kEcrCREhvjrLAjgNf90EPRgo1nKf4gQmRvTtCCSEC1y/Q0NkCk0NK1fyhYPJ44DxhRJeqTkJc9FTiwTMPlqshA0TYhBNt9VAgKGX/vGIYx/nIj+bOOclFeYGQuts4p1LxU64iAgLMTQ+kEcrCREhvjrLAjgNf90EPRgo1nKf4gQmRvTtCCRTy7wOJAAAAAAAAAAAAAAAAAAAAACICAtcv0NDZApNDStX8oWDyeOA8YUSXqk5CXPRU4sEzD5arFMwYrggAAAAAAAAAAAAAAAAAAAAAIgIDRNiEE231UCAoZf+8YhjH+ciP5s45yUV5gZC62zinUvEU9lzYaQAAAAAAAAAAAAAAAAAAAAAAAQBpUiEDa3kQtZHTp1bV7nWl6MwOJ+dF6FUw/qvSfU9YR6UPMIYhAq/hLVd9GiCj7a/C/T0lWs59G4sYPQr53T++W/VUOrx9IQNKJrA23w9fA99EdNB5JKmKBeEbolhEduGt20SCrOpAEVOuIgICr+EtV30aIKPtr8L9PSVazn0bixg9CvndP75b9VQ6vH0U1K2DcgAAAAAAAAAAAAAAAAEAAAAiAgNKJrA23w9fA99EdNB5JKmKBeEbolhEduGt20SCrOpAERRAXGW9AAAAAAAAAAAAAAAAAQAAACICA2t5ELWR06dW1e51pejMDifnRehVMP6r0n1PWEelDzCGFFR/RXYAAAAAAAAAAAAAAAABAAAAAAAA", + "psbtBase64": "cHNidP8BAOkEAACAhSAviQJLxI9SNxroqIb2jkqelBe2NeZ1H1jDjYRZGsNX8VyyjAAAAAAA/////0i4U3nKNMbygxuvs9bMbEx88ECpBosPLffB1IifsySGAQAAAAD/////BIQDAAAAAAAAF6kU2QlHRATBJKPQTD+/9h+qSc9DxYuHhAMAAAAAAAAXqRRO/XYem+YcqkIciqxKkCrW8qVLz4eEAwAAAAAAABepFNJNOBa+iiUMvd5+qmdPgBcM2pROhwAAAAAAAAAAEWoPc2V0ZWMgYXN0cm9ub215AAAAAAAAAAAAAAAAAAAAAAAAAE8BBIiyHgAAAAAAAAAAADqSLinwyOsNsqYEhMvctjH2sQfJyq4//c8+fS7B9rzQAxIUhxXzYdq2haZp1CQx5dbT+XNATaucn9G5ULJ5rXY0BMwYrghPAQSIsh4AAAAAAAAAAABtHWVtPd2RwZTARWWjYDcCohAWztFKJl84mC1ideZ7ZAPTusIxOnxrIcuxGxSw0QNB+SLApAOovYyH8NyCDzWvbgT2XNhpTwEEiLIeAAAAAAAAAAAAywT9Y6s02Q/mRmuIDioCzPioYzdDEpka+JEbGqq0QzQDNu8ij/6bjv/7oFLDLTNGYN0fg2bPj+RK5apnK2tikJUE8u8DiQj8BUJJVEdPAAQw8zdUAAEBINAHAAAAAAAAF6kUVnzXtE+fOgfDE483v5hLYPu68kOHAQMEAQAAAAEEaVIhA/b0B2S9XWPyAKJ3iIOs916W8VCVyZgmPAhycNDJfn5/IQNf+3q8cBWeBGn0uYmm1eF4WikEFp/wULL0aP5dPV278iED4VJNf2/FerPqy7ZZt4cQZ4CkddHbSDlSwjELfpo4l1tTriIGA1/7erxwFZ4EafS5iabV4XhaKQQWn/BQsvRo/l09XbvyFMwYrggAAAAAAAAAAAEAAAAAAAAAIgYD4VJNf2/FerPqy7ZZt4cQZ4CkddHbSDlSwjELfpo4l1sU9lzYaQAAAAAAAAAAAQAAAAAAAAAiBgP29AdkvV1j8gCid4iDrPdelvFQlcmYJjwIcnDQyX5+fxTy7wOJAAAAAAAAAAABAAAAAAAAAAABASDQBwAAAAAAABepFCCzcJTYKlE0Uf8MzZ2yOroFvF7zhwEDBAEAAAABBCMhAzbvIo/+m47/+6BSwy0zRmDdH4Nmz4/kSuWqZytrYpCVrAABAGlSIQLMTQ+kEcrCREhvjrLAjgNf90EPRgo1nKf4gQmRvTtCCSEC1y/Q0NkCk0NK1fyhYPJ44DxhRJeqTkJc9FTiwTMPlqshA0TYhBNt9VAgKGX/vGIYx/nIj+bOOclFeYGQuts4p1LxU64iAgLMTQ+kEcrCREhvjrLAjgNf90EPRgo1nKf4gQmRvTtCCRTy7wOJAAAAAAAAAAAAAAAAAAAAACICAtcv0NDZApNDStX8oWDyeOA8YUSXqk5CXPRU4sEzD5arFMwYrggAAAAAAAAAAAAAAAAAAAAAIgIDRNiEE231UCAoZf+8YhjH+ciP5s45yUV5gZC62zinUvEU9lzYaQAAAAAAAAAAAAAAAAAAAAAAAQBpUiEDa3kQtZHTp1bV7nWl6MwOJ+dF6FUw/qvSfU9YR6UPMIYhAq/hLVd9GiCj7a/C/T0lWs59G4sYPQr53T++W/VUOrx9IQNKJrA23w9fA99EdNB5JKmKBeEbolhEduGt20SCrOpAEVOuIgICr+EtV30aIKPtr8L9PSVazn0bixg9CvndP75b9VQ6vH0U1K2DcgAAAAAAAAAAAAAAAAEAAAAiAgNKJrA23w9fA99EdNB5JKmKBeEbolhEduGt20SCrOpAERRAXGW9AAAAAAAAAAAAAAAAAQAAACICA2t5ELWR06dW1e51pejMDifnRehVMP6r0n1PWEelDzCGFFR/RXYAAAAAAAAAAAAAAAABAAAAAAAA", "psbtBase64Finalized": null, "inputs": [ { - "hash": "ed950a6fa3ff06d2c22ca7c7834bb067ae7b2331ccf1d48e847a0c5475dd1975", + "hash": "4bc48f52371ae8a886f68e4a9e9417b635e6751f58c38d84591ac357f15cb28c", "index": 0, "sequence": 4294967295 }, { - "hash": "144896e405e26925e0c7549d778b57c737449963ca999e6b61a3ee2e129aa418", + "hash": "48b85379ca34c6f2831bafb3d6cc6c4c7cf040a9068b0f2df7c1d4889fb32486", "index": 1, "sequence": 4294967295 } diff --git a/modules/utxo-lib/test/bitgo/zcash/consensusBranchId.ts b/modules/utxo-lib/test/bitgo/zcash/consensusBranchId.ts new file mode 100644 index 0000000000..ae56b4cab1 --- /dev/null +++ b/modules/utxo-lib/test/bitgo/zcash/consensusBranchId.ts @@ -0,0 +1,45 @@ +import * as assert from 'assert'; +import { networks } from '../../../src'; +import { + ZcashTransaction, + getDefaultConsensusBranchIdForVersion, + getDefaultTransactionVersion, +} from '../../../src/bitgo'; + +// NU6.2 emergency hard fork re-enabling Orchard (mainnet block 3364600, testnet 4052000). +describe('Zcash consensus branch id (NU6.2)', function () { + const NU6_1_BRANCH_ID = 0x4dec4df0; + const NU6_2_BRANCH_ID = 0x5437f330; + + it('defaults mainnet transaction builds to NU6.2', function () { + assert.strictEqual(getDefaultTransactionVersion(networks.zcash), ZcashTransaction.VERSION4_BRANCH_NU6_2); + assert.strictEqual( + getDefaultConsensusBranchIdForVersion(networks.zcash, ZcashTransaction.VERSION4_BRANCH_NU6_2), + NU6_2_BRANCH_ID + ); + assert.strictEqual( + getDefaultConsensusBranchIdForVersion(networks.zcash, ZcashTransaction.VERSION5_BRANCH_NU6_2), + NU6_2_BRANCH_ID + ); + // Bare version 4/5 on mainnet resolve to the current upgrade (NU6.2). + assert.strictEqual(getDefaultConsensusBranchIdForVersion(networks.zcash, 4), NU6_2_BRANCH_ID); + assert.strictEqual(getDefaultConsensusBranchIdForVersion(networks.zcash, 5), NU6_2_BRANCH_ID); + }); + + it('keeps testnet on NU6.1 (NU6.2 not yet activated on testnet)', function () { + assert.strictEqual(getDefaultTransactionVersion(networks.zcashTest), ZcashTransaction.VERSION4_BRANCH_NU6_1); + assert.strictEqual(getDefaultConsensusBranchIdForVersion(networks.zcashTest, 4), NU6_1_BRANCH_ID); + assert.strictEqual(getDefaultConsensusBranchIdForVersion(networks.zcashTest, 5), NU6_1_BRANCH_ID); + }); + + it('still resolves explicit NU6.1 versions to the NU6.1 branch id', function () { + assert.strictEqual( + getDefaultConsensusBranchIdForVersion(networks.zcash, ZcashTransaction.VERSION4_BRANCH_NU6_1), + NU6_1_BRANCH_ID + ); + assert.strictEqual( + getDefaultConsensusBranchIdForVersion(networks.zcash, ZcashTransaction.VERSION5_BRANCH_NU6_1), + NU6_1_BRANCH_ID + ); + }); +});