diff --git a/modules/bitgo/test/v2/unit/coins/utxo/fixtures/tzec/recovery/backupKeyRecovery-p2sh-fullSignedRecovery-customUserKeyPath.json b/modules/bitgo/test/v2/unit/coins/utxo/fixtures/tzec/recovery/backupKeyRecovery-p2sh-fullSignedRecovery-customUserKeyPath.json index 2eea46b9ce..2b9d5e153c 100644 --- a/modules/bitgo/test/v2/unit/coins/utxo/fixtures/tzec/recovery/backupKeyRecovery-p2sh-fullSignedRecovery-customUserKeyPath.json +++ b/modules/bitgo/test/v2/unit/coins/utxo/fixtures/tzec/recovery/backupKeyRecovery-p2sh-fullSignedRecovery-customUserKeyPath.json @@ -1,7 +1,7 @@ { "inputs": [ { - "id": "66f3f676804cd3a1fcc6186b5db9b926259e1dd21edd3dd19d6e672aeac88413:0", + "id": "cc7efd95b6f94acbda360651c780ea58c4c371037091109771afdcfaf33f335e:0", "address": "t2HhxiGYUsUWLZkup8DeCZqo5PEY6jZfWTf", "value": 100000000, "chain": 1, @@ -9,7 +9,7 @@ "valueString": "100000000" }, { - "id": "12e0548c5f3fc8a84892228646a1dd34852db134833e911d1a52cf062ecdd427:2", + "id": "a24a2cd7fb85172a5ea5f4cf61a9dd06e2984728159f22a67cde851ad882699a:2", "address": "t26gsuA7j1Zmp5RZmg2KtVZvF1fzK4mWCZg", "value": 200000000, "chain": 1, @@ -17,7 +17,7 @@ "valueString": "200000000" }, { - "id": "89184a1631f587460b8e6abe0802f41dca0f74a6e04e8c85f6696aeb95fc99b2:3", + "id": "7bead8877955599d489931dd6feb790d1ab734907feb74c02002f1a04dfecc06:3", "address": "t29TeH3Wo9iDDw5YXD1nSn3zKfGez5iCU6n", "value": 300000000, "chain": 1, @@ -25,6 +25,6 @@ "valueString": "300000000" } ], - "transactionHex": "0400008085202f89031384c8ea2a676e9dd13ddd1ed21d9e2526b9b95d6b18c6fca1d34c8076f6f36600000000fdfd0000483045022100e4d027841df7dd2bb415e3fd54e72870a2ecc999863321939b29f966f97a743702205fd01a7f7583f0fb7b7b34d460ea16b7df842384c5b03ee7512737affe719806014730440220272c6fb226db6b2c6cf60cb40ddaad395e6ce72eb7073d55027dec8f5fb36d3402202577b26ca78505d2f44e4c144364ffd2c6a9633505f0a5a76b66da5a4072bb8e014c69522102587d7749d1ed2a3d3d300b969e68cbedb042ea19e3ee90c4131e2092f5e1181e21030795af84ecc10252d8a894f54845beeb5624a1c24c3747cc654bd430539dee3521029b30ebe8eb23f8cec82f25a80e3b423979ec3ba1fe07d9d4ed9f6361258bc31d53aeffffffff27d4cd2e06cf521a1d913e8334b12d8534dda14686229248a8c83f5f8c54e01202000000fdfe0000483045022100d67868928430f2427f2f9bc167fec822f634ac1f2f5e18bd6a1c278a65e295db0220289a21f2d64c4cd5f303b3bffeb8b6073e6ca9167673b613e69743a5c7af5c9e014830450221008186cd59144df8552082a5cd683065539a751c391a306beb99cf5f6b1e7f556302200145d02b9a90b6ddc938f07f3838674e01514ead9941dde8dac320f352997bf1014c695221025f891d428e847408357073c5b14344ec582230b4007695110140b2433f8e4fa82103b85d4e424ae44b828e313ca36fa1fc83cdc7f3eefd722cb89ed6d1b3caf385b921026d466a768d425c86687b79a28faa5297d4016b37c09d779bc0313d688e0f302453aeffffffffb299fc95eb6a69f6858c4ee0a6740fca1df40208be6a8e0b4687f531164a188903000000fdfd0000483045022100b474fe2bfc143e467c72e80a3fc29cf0dd51e9fd6930a82a102049d881c0d1660220442bc96c9deddf11bc42bb57201ce7c54d7d18667ce116d1e3875a1de6cf87270147304402200159da54aa64df404962eb41a80eb5ce1818ced094b28fae1f1bf8c7f5460fcf02204ccfc753e1c1c4a4d995d6b9aaf3a0af2aac11699c7422d18e2149a870d9a12c014c6952210228b669c7736183ae301d159ee7788e1a7dccb7ec3d45de94eccf0b384aa8f78021022438d658cc970895bf05bb617fbf4036600fc716bec8adb92aeaa317edd1700d2102b650623b12f2407c25496559410dfd0624dda8b79908bc9d80402100406e4f4b53aeffffffff010c44c3230000000017a91439c65a0d0072a140694d6b13ec5f5f2437de99ff8700000000000000000000000000000000000000", - "txid": "28a1c58868ce014a0d960e036420577e4a0a9081bc1544863f538f6fabae0643" + "transactionHex": "0400008085202f89035e333ff3fadcaf71971091700371c3c458ea80c7510636dacb4af9b695fd7ecc00000000fdfd0000483045022100d35d1ae5faf861b269db11df4536b08bc0d72d97b521caf0304c7fb5fe35256d02206f8419f40a5d506f4624a1ed3621a963f31f400d2ac04dfd20707b2bf1b8dd02014730440220391a854f482e90344d8334cf03960892913d24c16689a2b6d4ee4cfe1a72373c02201af8d2d20bd0c4d1c6240e4284a5af64faf828a8d652e11aaef03b0582f4816d014c69522102587d7749d1ed2a3d3d300b969e68cbedb042ea19e3ee90c4131e2092f5e1181e21030795af84ecc10252d8a894f54845beeb5624a1c24c3747cc654bd430539dee3521029b30ebe8eb23f8cec82f25a80e3b423979ec3ba1fe07d9d4ed9f6361258bc31d53aeffffffff9a6982d81a85de7ca6229f15284798e206dda961cff4a55e2a1785fbd72c4aa202000000fc00473044022013d5b4d781130d25e569c6d86a12bdaf1cb847305a2f9a504aa4fd9c9f6b43e002201e09796107a54b0f63bc0cd870f6d030ac78016d208b7febf3b2372f3ef241a201473044022026b0e8e3f5504338d918a1d64257e9c42ac9577c0a34f6da5c2d6842e177db7a02207bab32a1a34e8fa89444cb32a10915a3660b4efcd4d12b7f799c003a917fa496014c695221025f891d428e847408357073c5b14344ec582230b4007695110140b2433f8e4fa82103b85d4e424ae44b828e313ca36fa1fc83cdc7f3eefd722cb89ed6d1b3caf385b921026d466a768d425c86687b79a28faa5297d4016b37c09d779bc0313d688e0f302453aeffffffff06ccfe4da0f10220c074eb7f9034b71a0d79eb6fdd3199489d59557987d8ea7b03000000fdfd000048304502210088be16b93b79868cdc5e59d569e259ddcd0e59b0945e24ce1a2a23a6fe219a82022034ef31e0ea6a828d439da7a72f3b98547b7ecfd09883af24577bbc3ef86daa510147304402202025e46baea47ec51a264ac9207ac3027ed4622db1c589c10a44134313dc8882022001e815b731f07eab6235952f27c1ea02a0f4249f01669fae10b5f1704340ecf8014c6952210228b669c7736183ae301d159ee7788e1a7dccb7ec3d45de94eccf0b384aa8f78021022438d658cc970895bf05bb617fbf4036600fc716bec8adb92aeaa317edd1700d2102b650623b12f2407c25496559410dfd0624dda8b79908bc9d80402100406e4f4b53aeffffffff010c44c3230000000017a91439c65a0d0072a140694d6b13ec5f5f2437de99ff8700000000000000000000000000000000000000", + "txid": "5ebdfa48a8affa7a4704bf71147fd84d73b4a6b25990e4933eec90fcf383e191" } \ No newline at end of file diff --git a/modules/bitgo/test/v2/unit/coins/utxo/fixtures/tzec/recovery/backupKeyRecovery-p2sh-fullSignedRecovery-fixedFeeRate.json b/modules/bitgo/test/v2/unit/coins/utxo/fixtures/tzec/recovery/backupKeyRecovery-p2sh-fullSignedRecovery-fixedFeeRate.json index b724b621af..d13bd28ca1 100644 --- a/modules/bitgo/test/v2/unit/coins/utxo/fixtures/tzec/recovery/backupKeyRecovery-p2sh-fullSignedRecovery-fixedFeeRate.json +++ b/modules/bitgo/test/v2/unit/coins/utxo/fixtures/tzec/recovery/backupKeyRecovery-p2sh-fullSignedRecovery-fixedFeeRate.json @@ -1,7 +1,7 @@ { "inputs": [ { - "id": "e3c1f3595baf0982710dc20783f451173b0d17c5ea0027236f83a474f82dae17:0", + "id": "9828c8f963402188c062badc31e9537cf9fb8f9733221e01281240ede7e31443:0", "address": "t2ChBQL66RU2M9DnktwM1uZJB4BAeZTVZAQ", "value": 100000000, "chain": 1, @@ -9,7 +9,7 @@ "valueString": "100000000" }, { - "id": "f6787758983a2e08b93385be99cc50bccaee926c836b1e9851c56e075d0dbd18:2", + "id": "adc8a0f6b58d979291d3f420db2232027bba7a429bc4820e5a6473ad528977c8:2", "address": "t2CMZJUHkYjDncMtFBWs5GNdJ6DDnsLmM5p", "value": 200000000, "chain": 1, @@ -17,7 +17,7 @@ "valueString": "200000000" }, { - "id": "5596da17a250bbe132d822690969772446fc647459d8940564f2bb7eae32421c:3", + "id": "b0cf3ddc0771aabbb71a7f0f118273a950c020a5b07375f8861cec27678c8e58:3", "address": "t26vDQNkirotDDAxvLnJUaMnss61cu3WNJi", "value": 300000000, "chain": 1, @@ -25,6 +25,6 @@ "valueString": "300000000" } ], - "transactionHex": "0400008085202f890317ae2df874a4836f232700eac5170d3b1751f48307c20d718209af5b59f3c1e300000000fdfd0000473044022022da2d2b6c6f938a02b8a02e39ae02ae54e48bf758ffdd8ad2a776236559f4aa022003582b0bef55aabcd63483f767de9257f0dbc3e582ec3c124da26348dcf5bcd201483045022100dccd3a127efeac984e859d2958c95d2ac4f348275079d06414c758d47a8d13e40220227c3b5586e1031114090820e0ddec62f0f559768d33918676803e2ee7364239014c69522102d06c08ccf0fddefff881e869b951d4b92e936118b3360182c5b8c55f4c40bc6121030795af84ecc10252d8a894f54845beeb5624a1c24c3747cc654bd430539dee3521029b30ebe8eb23f8cec82f25a80e3b423979ec3ba1fe07d9d4ed9f6361258bc31d53aeffffffff18bd0d5d076ec551981e6b836c92eecabc50cc99be8533b9082e3a98587778f602000000fdfd000047304402204e52c7e4af66824d65efda7c00f8cf6cdc11bc9bbdee9ac74a8d23d59528f52002204117b8abaf6ad0cde73d72b158d7e89b94fa3641a2dddb99c72168dec7ebc1ee01483045022100f816fb6dfd1e90b29013355c1155d37e893e15ca0690a013f8846e96548f16b9022048bd26677b0327b5c66da87145f1ad0ad49a6207377dea6a2e314493cd129ac6014c695221021a8d0b4e9ad8c7538f7b9ea0441b33ed3611559afef335a990e4702fb95d41a72103b85d4e424ae44b828e313ca36fa1fc83cdc7f3eefd722cb89ed6d1b3caf385b921026d466a768d425c86687b79a28faa5297d4016b37c09d779bc0313d688e0f302453aeffffffff1c4232ae7ebbf2640594d8597464fc46247769096922d832e1bb50a217da965503000000fdfd00004830450221008fd93b42c234f6dd26a742138d36fc9b244429fbd04006f1220f46196e3b277302202e44cb33429c67cd8d2dd1d606c37416231df12a2739ed31998b73265d0550320147304402206853bd89aa2079e5e09c3f87fa717b2e84bdfd1e2a697aabb1437cf460b4e342022040733883b896e4b9968bb2d71f865d6a0147ef242ac77ca8f1228aee50e70134014c695221023c5cbb819b0bcb5c7bf8db592d4c1d15d1b8d14d49b444ba4e85131316b24d4c21022438d658cc970895bf05bb617fbf4036600fc716bec8adb92aeaa317edd1700d2102b650623b12f2407c25496559410dfd0624dda8b79908bc9d80402100406e4f4b53aeffffffff010c44c3230000000017a91439c65a0d0072a140694d6b13ec5f5f2437de99ff8700000000000000000000000000000000000000", - "txid": "a83588db6c6b0921161d43a3621acdc60f98b43e714066a459f941afaceee667" + "transactionHex": "0400008085202f89034314e3e7ed401228011e2233978ffbf97c53e931dcba62c088214063f9c8289800000000fdfd0000473044022000ed1b9e220fb33bf29dd1f3c080fd51fe006b16e820ace436f5ca2926aae0f1022064a091f688a3ccd9f229a36d584a51cfbec9651e73345a29424f8ca6205b625101483045022100fec06e986023ac9c03c23ae7b9bfc70e9c7941e2fc8b99002279bcf93527129f022027d69acc137664e5cec18ab7fe1d98fd6c24ac1f78cfdce5295e5c7264650892014c69522102d06c08ccf0fddefff881e869b951d4b92e936118b3360182c5b8c55f4c40bc6121030795af84ecc10252d8a894f54845beeb5624a1c24c3747cc654bd430539dee3521029b30ebe8eb23f8cec82f25a80e3b423979ec3ba1fe07d9d4ed9f6361258bc31d53aeffffffffc8778952ad73645a0e82c49b427aba7b023222db20f4d39192978db5f6a0c8ad02000000fdfd000048304502210089e7edc69b2bb7f7449ac9b08534c12fd06af5880fba238498bcdc4699e1b0cf0220723f6ca8a6979c2d1462ed11a6dbbdb85d64c0a25421d789c774fb069c637ac40147304402207a8a799e8b45a05d499d7f840be05c7270e0322af69346e377919ec65a013c4802201b2a5f0fa57a97bb7ae309427201f7ffed10bcb1112ac6bcd20a35f2f76321d4014c695221021a8d0b4e9ad8c7538f7b9ea0441b33ed3611559afef335a990e4702fb95d41a72103b85d4e424ae44b828e313ca36fa1fc83cdc7f3eefd722cb89ed6d1b3caf385b921026d466a768d425c86687b79a28faa5297d4016b37c09d779bc0313d688e0f302453aeffffffff588e8c6727ec1c86f87573b0a520c050a97382110f7f1ab7bbaa7107dc3dcfb003000000fdfd000048304502210081c624f9808f8020aafb7dd3c7bb4d9e8a4a7e8580968e4b7dc0dcea58469d23022068c5421cb6e61b5bd9d2b9a3b9ced6ade4a8c047fd98b54a8d97d0e40bdc9c010147304402203fc1bbf80ad62fe111cafe79fd75b46082b527e132600dc52c2e25fccbcd70f9022067ceacec865fa432266f5c68aabc5e44cbc5bdf21bf4b410d82ecf2141b7c811014c695221023c5cbb819b0bcb5c7bf8db592d4c1d15d1b8d14d49b444ba4e85131316b24d4c21022438d658cc970895bf05bb617fbf4036600fc716bec8adb92aeaa317edd1700d2102b650623b12f2407c25496559410dfd0624dda8b79908bc9d80402100406e4f4b53aeffffffff010c44c3230000000017a91439c65a0d0072a140694d6b13ec5f5f2437de99ff8700000000000000000000000000000000000000", + "txid": "9ad29a3e2e27e2e9673bcc6bd33ef7577f26b3d107b3af9a0ea623e00e524bb1" } \ No newline at end of file diff --git a/modules/bitgo/test/v2/unit/coins/utxo/fixtures/tzec/recovery/backupKeyRecovery-p2sh-fullSignedRecovery.json b/modules/bitgo/test/v2/unit/coins/utxo/fixtures/tzec/recovery/backupKeyRecovery-p2sh-fullSignedRecovery.json index b724b621af..d13bd28ca1 100644 --- a/modules/bitgo/test/v2/unit/coins/utxo/fixtures/tzec/recovery/backupKeyRecovery-p2sh-fullSignedRecovery.json +++ b/modules/bitgo/test/v2/unit/coins/utxo/fixtures/tzec/recovery/backupKeyRecovery-p2sh-fullSignedRecovery.json @@ -1,7 +1,7 @@ { "inputs": [ { - "id": "e3c1f3595baf0982710dc20783f451173b0d17c5ea0027236f83a474f82dae17:0", + "id": "9828c8f963402188c062badc31e9537cf9fb8f9733221e01281240ede7e31443:0", "address": "t2ChBQL66RU2M9DnktwM1uZJB4BAeZTVZAQ", "value": 100000000, "chain": 1, @@ -9,7 +9,7 @@ "valueString": "100000000" }, { - "id": "f6787758983a2e08b93385be99cc50bccaee926c836b1e9851c56e075d0dbd18:2", + "id": "adc8a0f6b58d979291d3f420db2232027bba7a429bc4820e5a6473ad528977c8:2", "address": "t2CMZJUHkYjDncMtFBWs5GNdJ6DDnsLmM5p", "value": 200000000, "chain": 1, @@ -17,7 +17,7 @@ "valueString": "200000000" }, { - "id": "5596da17a250bbe132d822690969772446fc647459d8940564f2bb7eae32421c:3", + "id": "b0cf3ddc0771aabbb71a7f0f118273a950c020a5b07375f8861cec27678c8e58:3", "address": "t26vDQNkirotDDAxvLnJUaMnss61cu3WNJi", "value": 300000000, "chain": 1, @@ -25,6 +25,6 @@ "valueString": "300000000" } ], - "transactionHex": "0400008085202f890317ae2df874a4836f232700eac5170d3b1751f48307c20d718209af5b59f3c1e300000000fdfd0000473044022022da2d2b6c6f938a02b8a02e39ae02ae54e48bf758ffdd8ad2a776236559f4aa022003582b0bef55aabcd63483f767de9257f0dbc3e582ec3c124da26348dcf5bcd201483045022100dccd3a127efeac984e859d2958c95d2ac4f348275079d06414c758d47a8d13e40220227c3b5586e1031114090820e0ddec62f0f559768d33918676803e2ee7364239014c69522102d06c08ccf0fddefff881e869b951d4b92e936118b3360182c5b8c55f4c40bc6121030795af84ecc10252d8a894f54845beeb5624a1c24c3747cc654bd430539dee3521029b30ebe8eb23f8cec82f25a80e3b423979ec3ba1fe07d9d4ed9f6361258bc31d53aeffffffff18bd0d5d076ec551981e6b836c92eecabc50cc99be8533b9082e3a98587778f602000000fdfd000047304402204e52c7e4af66824d65efda7c00f8cf6cdc11bc9bbdee9ac74a8d23d59528f52002204117b8abaf6ad0cde73d72b158d7e89b94fa3641a2dddb99c72168dec7ebc1ee01483045022100f816fb6dfd1e90b29013355c1155d37e893e15ca0690a013f8846e96548f16b9022048bd26677b0327b5c66da87145f1ad0ad49a6207377dea6a2e314493cd129ac6014c695221021a8d0b4e9ad8c7538f7b9ea0441b33ed3611559afef335a990e4702fb95d41a72103b85d4e424ae44b828e313ca36fa1fc83cdc7f3eefd722cb89ed6d1b3caf385b921026d466a768d425c86687b79a28faa5297d4016b37c09d779bc0313d688e0f302453aeffffffff1c4232ae7ebbf2640594d8597464fc46247769096922d832e1bb50a217da965503000000fdfd00004830450221008fd93b42c234f6dd26a742138d36fc9b244429fbd04006f1220f46196e3b277302202e44cb33429c67cd8d2dd1d606c37416231df12a2739ed31998b73265d0550320147304402206853bd89aa2079e5e09c3f87fa717b2e84bdfd1e2a697aabb1437cf460b4e342022040733883b896e4b9968bb2d71f865d6a0147ef242ac77ca8f1228aee50e70134014c695221023c5cbb819b0bcb5c7bf8db592d4c1d15d1b8d14d49b444ba4e85131316b24d4c21022438d658cc970895bf05bb617fbf4036600fc716bec8adb92aeaa317edd1700d2102b650623b12f2407c25496559410dfd0624dda8b79908bc9d80402100406e4f4b53aeffffffff010c44c3230000000017a91439c65a0d0072a140694d6b13ec5f5f2437de99ff8700000000000000000000000000000000000000", - "txid": "a83588db6c6b0921161d43a3621acdc60f98b43e714066a459f941afaceee667" + "transactionHex": "0400008085202f89034314e3e7ed401228011e2233978ffbf97c53e931dcba62c088214063f9c8289800000000fdfd0000473044022000ed1b9e220fb33bf29dd1f3c080fd51fe006b16e820ace436f5ca2926aae0f1022064a091f688a3ccd9f229a36d584a51cfbec9651e73345a29424f8ca6205b625101483045022100fec06e986023ac9c03c23ae7b9bfc70e9c7941e2fc8b99002279bcf93527129f022027d69acc137664e5cec18ab7fe1d98fd6c24ac1f78cfdce5295e5c7264650892014c69522102d06c08ccf0fddefff881e869b951d4b92e936118b3360182c5b8c55f4c40bc6121030795af84ecc10252d8a894f54845beeb5624a1c24c3747cc654bd430539dee3521029b30ebe8eb23f8cec82f25a80e3b423979ec3ba1fe07d9d4ed9f6361258bc31d53aeffffffffc8778952ad73645a0e82c49b427aba7b023222db20f4d39192978db5f6a0c8ad02000000fdfd000048304502210089e7edc69b2bb7f7449ac9b08534c12fd06af5880fba238498bcdc4699e1b0cf0220723f6ca8a6979c2d1462ed11a6dbbdb85d64c0a25421d789c774fb069c637ac40147304402207a8a799e8b45a05d499d7f840be05c7270e0322af69346e377919ec65a013c4802201b2a5f0fa57a97bb7ae309427201f7ffed10bcb1112ac6bcd20a35f2f76321d4014c695221021a8d0b4e9ad8c7538f7b9ea0441b33ed3611559afef335a990e4702fb95d41a72103b85d4e424ae44b828e313ca36fa1fc83cdc7f3eefd722cb89ed6d1b3caf385b921026d466a768d425c86687b79a28faa5297d4016b37c09d779bc0313d688e0f302453aeffffffff588e8c6727ec1c86f87573b0a520c050a97382110f7f1ab7bbaa7107dc3dcfb003000000fdfd000048304502210081c624f9808f8020aafb7dd3c7bb4d9e8a4a7e8580968e4b7dc0dcea58469d23022068c5421cb6e61b5bd9d2b9a3b9ced6ade4a8c047fd98b54a8d97d0e40bdc9c010147304402203fc1bbf80ad62fe111cafe79fd75b46082b527e132600dc52c2e25fccbcd70f9022067ceacec865fa432266f5c68aabc5e44cbc5bdf21bf4b410d82ecf2141b7c811014c695221023c5cbb819b0bcb5c7bf8db592d4c1d15d1b8d14d49b444ba4e85131316b24d4c21022438d658cc970895bf05bb617fbf4036600fc716bec8adb92aeaa317edd1700d2102b650623b12f2407c25496559410dfd0624dda8b79908bc9d80402100406e4f4b53aeffffffff010c44c3230000000017a91439c65a0d0072a140694d6b13ec5f5f2437de99ff8700000000000000000000000000000000000000", + "txid": "9ad29a3e2e27e2e9673bcc6bd33ef7577f26b3d107b3af9a0ea623e00e524bb1" } \ No newline at end of file diff --git a/modules/bitgo/test/v2/unit/coins/utxo/fixtures/tzec/recovery/backupKeyRecovery-p2sh-keyRecoveryService-dai.json b/modules/bitgo/test/v2/unit/coins/utxo/fixtures/tzec/recovery/backupKeyRecovery-p2sh-keyRecoveryService-dai.json index 7741de3fa0..8d91a580e6 100644 --- a/modules/bitgo/test/v2/unit/coins/utxo/fixtures/tzec/recovery/backupKeyRecovery-p2sh-keyRecoveryService-dai.json +++ b/modules/bitgo/test/v2/unit/coins/utxo/fixtures/tzec/recovery/backupKeyRecovery-p2sh-keyRecoveryService-dai.json @@ -1,8 +1,8 @@ { - "transactionHex": "70736274ff0100b80400008085202f890317ae2df874a4836f232700eac5170d3b1751f48307c20d718209af5b59f3c1e30000000000ffffffff18bd0d5d076ec551981e6b836c92eecabc50cc99be8533b9082e3a98587778f60200000000ffffffff1c4232ae7ebbf2640594d8597464fc46247769096922d832e1bb50a217da96550300000000ffffffff01a63bc3230000000017a91439c65a0d0072a140694d6b13ec5f5f2437de99ff87000000000000000000000000000000000000004f010488b21e0000000000000000004b256d3cf3524c8d7086e295a1923d6fa2f99b686699ed50084bb114495c982403a86864862a9e315221809501f2a4200cd9e057a70f9164d485d4cfbeb8e47c74048374ad864f010488b21e000000000000000000914cc440157319de14126a1a2e87ea86f3b983f923fb17693a157b721220d74c02e81e105716179975cc47afd117cae272519aafdd6bfff688e4280d384e13184f04e15f6f214f010488b21e000000000000000000da28679577f7faf0ed86164da220aa4a29c7edfb0de8bdabd97f19fd15e74bed03db2b42af97f60db6ec5a1500e246ef2107660c4fc02699ed69b82c2f3e9324ae0403a8239108fc05424954474f00045510e7c80001012000e1f5050000000017a9144365f80ae9830dab1d9124be68c74c2fa23bbc1287220202d06c08ccf0fddefff881e869b951d4b92e936118b3360182c5b8c55f4c40bc61483045022100ee4f0d6f975d4ccb8e55ac29934398655907266b49f06cde4922e37ee78e0a530220059831089556a88ce6e6565a6a311f8f8f6e06ad347a94ee98118b28d205072d0101030401000000010469522102d06c08ccf0fddefff881e869b951d4b92e936118b3360182c5b8c55f4c40bc6121030795af84ecc10252d8a894f54845beeb5624a1c24c3747cc654bd430539dee3521029b30ebe8eb23f8cec82f25a80e3b423979ec3ba1fe07d9d4ed9f6361258bc31d53ae2206029b30ebe8eb23f8cec82f25a80e3b423979ec3ba1fe07d9d4ed9f6361258bc31d148374ad8600000000000000000100000000000000220602d06c08ccf0fddefff881e869b951d4b92e936118b3360182c5b8c55f4c40bc611403a82391000000000000000001000000000000002206030795af84ecc10252d8a894f54845beeb5624a1c24c3747cc654bd430539dee3514e15f6f21000000000000000001000000000000000001012000c2eb0b0000000017a9143fafee16e19a14db449ab3a57da1fd3ef89daa59872202021a8d0b4e9ad8c7538f7b9ea0441b33ed3611559afef335a990e4702fb95d41a7483045022100b2028b51e097d42bc90d2d953e46c42c5133dbec33b7536fe8bcc276b13369e10220205cc4fc26bc2f73ac5700e882429e7818754d1b2e397c5fefba23455a1074d201010304010000000104695221021a8d0b4e9ad8c7538f7b9ea0441b33ed3611559afef335a990e4702fb95d41a72103b85d4e424ae44b828e313ca36fa1fc83cdc7f3eefd722cb89ed6d1b3caf385b921026d466a768d425c86687b79a28faa5297d4016b37c09d779bc0313d688e0f302453ae2206021a8d0b4e9ad8c7538f7b9ea0441b33ed3611559afef335a990e4702fb95d41a71403a82391000000000000000001000000020000002206026d466a768d425c86687b79a28faa5297d4016b37c09d779bc0313d688e0f3024148374ad8600000000000000000100000002000000220603b85d4e424ae44b828e313ca36fa1fc83cdc7f3eefd722cb89ed6d1b3caf385b914e15f6f21000000000000000001000000020000000001012000a3e1110000000017a914040c4ab99a665c767adaa50fb28dce2ae514363b872202023c5cbb819b0bcb5c7bf8db592d4c1d15d1b8d14d49b444ba4e85131316b24d4c47304402203f7fcbc09c2d692e4f4bd752448e4d9865b90cf353846697195237a02a8228bf0220228829576ab98339a43a9943b15b3eb13c075ddad267a744159340b7850517f901010304010000000104695221023c5cbb819b0bcb5c7bf8db592d4c1d15d1b8d14d49b444ba4e85131316b24d4c21022438d658cc970895bf05bb617fbf4036600fc716bec8adb92aeaa317edd1700d2102b650623b12f2407c25496559410dfd0624dda8b79908bc9d80402100406e4f4b53ae2206022438d658cc970895bf05bb617fbf4036600fc716bec8adb92aeaa317edd1700d14e15f6f21000000000000000001000000030000002206023c5cbb819b0bcb5c7bf8db592d4c1d15d1b8d14d49b444ba4e85131316b24d4c1403a8239100000000000000000100000003000000220602b650623b12f2407c25496559410dfd0624dda8b79908bc9d80402100406e4f4b148374ad86000000000000000001000000030000000000", + "transactionHex": "70736274ff0100b80400008085202f89034314e3e7ed401228011e2233978ffbf97c53e931dcba62c088214063f9c828980000000000ffffffffc8778952ad73645a0e82c49b427aba7b023222db20f4d39192978db5f6a0c8ad0200000000ffffffff588e8c6727ec1c86f87573b0a520c050a97382110f7f1ab7bbaa7107dc3dcfb00300000000ffffffff01a63bc3230000000017a91439c65a0d0072a140694d6b13ec5f5f2437de99ff87000000000000000000000000000000000000004f010488b21e0000000000000000004b256d3cf3524c8d7086e295a1923d6fa2f99b686699ed50084bb114495c982403a86864862a9e315221809501f2a4200cd9e057a70f9164d485d4cfbeb8e47c74048374ad864f010488b21e000000000000000000914cc440157319de14126a1a2e87ea86f3b983f923fb17693a157b721220d74c02e81e105716179975cc47afd117cae272519aafdd6bfff688e4280d384e13184f04e15f6f214f010488b21e000000000000000000da28679577f7faf0ed86164da220aa4a29c7edfb0de8bdabd97f19fd15e74bed03db2b42af97f60db6ec5a1500e246ef2107660c4fc02699ed69b82c2f3e9324ae0403a8239108fc05424954474f0004f04dec4d0001012000e1f5050000000017a9144365f80ae9830dab1d9124be68c74c2fa23bbc1287220202d06c08ccf0fddefff881e869b951d4b92e936118b3360182c5b8c55f4c40bc61483045022100c30a2fc7dee8fd9c09c9a6ce94c1ea21be7b0a4c78ccf200b2a215cf46d7ab6102201a3243aa57b22895e2721182861f23f9707aeb3fc43642c1794153a05e2c721a0101030401000000010469522102d06c08ccf0fddefff881e869b951d4b92e936118b3360182c5b8c55f4c40bc6121030795af84ecc10252d8a894f54845beeb5624a1c24c3747cc654bd430539dee3521029b30ebe8eb23f8cec82f25a80e3b423979ec3ba1fe07d9d4ed9f6361258bc31d53ae2206029b30ebe8eb23f8cec82f25a80e3b423979ec3ba1fe07d9d4ed9f6361258bc31d148374ad8600000000000000000100000000000000220602d06c08ccf0fddefff881e869b951d4b92e936118b3360182c5b8c55f4c40bc611403a82391000000000000000001000000000000002206030795af84ecc10252d8a894f54845beeb5624a1c24c3747cc654bd430539dee3514e15f6f21000000000000000001000000000000000001012000c2eb0b0000000017a9143fafee16e19a14db449ab3a57da1fd3ef89daa59872202021a8d0b4e9ad8c7538f7b9ea0441b33ed3611559afef335a990e4702fb95d41a7473044022039b134caafd2c9c8a027ddb07c7a73281b53cd7d11cc026fc6d1a0f7da3ae1070220761a045d5dba815cdf5146d739af79f95724216f2118ba022a0a5e110995fa3d01010304010000000104695221021a8d0b4e9ad8c7538f7b9ea0441b33ed3611559afef335a990e4702fb95d41a72103b85d4e424ae44b828e313ca36fa1fc83cdc7f3eefd722cb89ed6d1b3caf385b921026d466a768d425c86687b79a28faa5297d4016b37c09d779bc0313d688e0f302453ae2206021a8d0b4e9ad8c7538f7b9ea0441b33ed3611559afef335a990e4702fb95d41a71403a82391000000000000000001000000020000002206026d466a768d425c86687b79a28faa5297d4016b37c09d779bc0313d688e0f3024148374ad8600000000000000000100000002000000220603b85d4e424ae44b828e313ca36fa1fc83cdc7f3eefd722cb89ed6d1b3caf385b914e15f6f21000000000000000001000000020000000001012000a3e1110000000017a914040c4ab99a665c767adaa50fb28dce2ae514363b872202023c5cbb819b0bcb5c7bf8db592d4c1d15d1b8d14d49b444ba4e85131316b24d4c483045022100dca89ed290294439c14171f9caa1441e257c8218fe810284f26b3e7466660afb02205489a8be711b165a6d1a2f61d415c118258aff2c1a35115ee7fbbdcb2a5c114a01010304010000000104695221023c5cbb819b0bcb5c7bf8db592d4c1d15d1b8d14d49b444ba4e85131316b24d4c21022438d658cc970895bf05bb617fbf4036600fc716bec8adb92aeaa317edd1700d2102b650623b12f2407c25496559410dfd0624dda8b79908bc9d80402100406e4f4b53ae2206022438d658cc970895bf05bb617fbf4036600fc716bec8adb92aeaa317edd1700d14e15f6f21000000000000000001000000030000002206023c5cbb819b0bcb5c7bf8db592d4c1d15d1b8d14d49b444ba4e85131316b24d4c1403a8239100000000000000000100000003000000220602b650623b12f2407c25496559410dfd0624dda8b79908bc9d80402100406e4f4b148374ad86000000000000000001000000030000000000", "coin": "tzec", "backupKey": "xpub661MyMwAqRbcFzLXuganogQvd7MrefQQqCcJP2ZDumnCdQecf5cw1P1nD5qBz8SNS1yCLSC9VqpNUWnQU3V6qmnPt2r21oXhicQFzPA6Lby", "recoveryAmount": 599997350, "recoveryAmountString": "599997350", - "txid": "44c5d2ddc2725bed05885036f21fb019f5d2192c1d6803f886ba49d08035a6b5" + "txid": "905178ad551c0f32fb499248cd0c1dd7cae762d1c6652ab229eca0393ceba235" } \ No newline at end of file diff --git a/modules/bitgo/test/v2/unit/coins/utxo/fixtures/tzec/recovery/backupKeyRecovery-p2sh-keyRecoveryService-keyternal.json b/modules/bitgo/test/v2/unit/coins/utxo/fixtures/tzec/recovery/backupKeyRecovery-p2sh-keyRecoveryService-keyternal.json index 4cd9693688..d9f39c56dd 100644 --- a/modules/bitgo/test/v2/unit/coins/utxo/fixtures/tzec/recovery/backupKeyRecovery-p2sh-keyRecoveryService-keyternal.json +++ b/modules/bitgo/test/v2/unit/coins/utxo/fixtures/tzec/recovery/backupKeyRecovery-p2sh-keyRecoveryService-keyternal.json @@ -1,7 +1,7 @@ { "inputs": [ { - "id": "e3c1f3595baf0982710dc20783f451173b0d17c5ea0027236f83a474f82dae17:0", + "id": "9828c8f963402188c062badc31e9537cf9fb8f9733221e01281240ede7e31443:0", "address": "t2ChBQL66RU2M9DnktwM1uZJB4BAeZTVZAQ", "value": 100000000, "chain": 1, @@ -9,7 +9,7 @@ "valueString": "100000000" }, { - "id": "f6787758983a2e08b93385be99cc50bccaee926c836b1e9851c56e075d0dbd18:2", + "id": "adc8a0f6b58d979291d3f420db2232027bba7a429bc4820e5a6473ad528977c8:2", "address": "t2CMZJUHkYjDncMtFBWs5GNdJ6DDnsLmM5p", "value": 200000000, "chain": 1, @@ -17,7 +17,7 @@ "valueString": "200000000" }, { - "id": "5596da17a250bbe132d822690969772446fc647459d8940564f2bb7eae32421c:3", + "id": "b0cf3ddc0771aabbb71a7f0f118273a950c020a5b07375f8861cec27678c8e58:3", "address": "t26vDQNkirotDDAxvLnJUaMnss61cu3WNJi", "value": 300000000, "chain": 1, @@ -25,10 +25,10 @@ "valueString": "300000000" } ], - "transactionHex": "0400008085202f890317ae2df874a4836f232700eac5170d3b1751f48307c20d718209af5b59f3c1e300000000b700483045022100ee4f0d6f975d4ccb8e55ac29934398655907266b49f06cde4922e37ee78e0a530220059831089556a88ce6e6565a6a311f8f8f6e06ad347a94ee98118b28d205072d0100004c69522102d06c08ccf0fddefff881e869b951d4b92e936118b3360182c5b8c55f4c40bc6121030795af84ecc10252d8a894f54845beeb5624a1c24c3747cc654bd430539dee3521029b30ebe8eb23f8cec82f25a80e3b423979ec3ba1fe07d9d4ed9f6361258bc31d53aeffffffff18bd0d5d076ec551981e6b836c92eecabc50cc99be8533b9082e3a98587778f602000000b700483045022100b2028b51e097d42bc90d2d953e46c42c5133dbec33b7536fe8bcc276b13369e10220205cc4fc26bc2f73ac5700e882429e7818754d1b2e397c5fefba23455a1074d20100004c695221021a8d0b4e9ad8c7538f7b9ea0441b33ed3611559afef335a990e4702fb95d41a72103b85d4e424ae44b828e313ca36fa1fc83cdc7f3eefd722cb89ed6d1b3caf385b921026d466a768d425c86687b79a28faa5297d4016b37c09d779bc0313d688e0f302453aeffffffff1c4232ae7ebbf2640594d8597464fc46247769096922d832e1bb50a217da965503000000b60047304402203f7fcbc09c2d692e4f4bd752448e4d9865b90cf353846697195237a02a8228bf0220228829576ab98339a43a9943b15b3eb13c075ddad267a744159340b7850517f90100004c695221023c5cbb819b0bcb5c7bf8db592d4c1d15d1b8d14d49b444ba4e85131316b24d4c21022438d658cc970895bf05bb617fbf4036600fc716bec8adb92aeaa317edd1700d2102b650623b12f2407c25496559410dfd0624dda8b79908bc9d80402100406e4f4b53aeffffffff01a63bc3230000000017a91439c65a0d0072a140694d6b13ec5f5f2437de99ff8700000000000000000000000000000000000000", + "transactionHex": "0400008085202f89034314e3e7ed401228011e2233978ffbf97c53e931dcba62c088214063f9c8289800000000b700483045022100c30a2fc7dee8fd9c09c9a6ce94c1ea21be7b0a4c78ccf200b2a215cf46d7ab6102201a3243aa57b22895e2721182861f23f9707aeb3fc43642c1794153a05e2c721a0100004c69522102d06c08ccf0fddefff881e869b951d4b92e936118b3360182c5b8c55f4c40bc6121030795af84ecc10252d8a894f54845beeb5624a1c24c3747cc654bd430539dee3521029b30ebe8eb23f8cec82f25a80e3b423979ec3ba1fe07d9d4ed9f6361258bc31d53aeffffffffc8778952ad73645a0e82c49b427aba7b023222db20f4d39192978db5f6a0c8ad02000000b600473044022039b134caafd2c9c8a027ddb07c7a73281b53cd7d11cc026fc6d1a0f7da3ae1070220761a045d5dba815cdf5146d739af79f95724216f2118ba022a0a5e110995fa3d0100004c695221021a8d0b4e9ad8c7538f7b9ea0441b33ed3611559afef335a990e4702fb95d41a72103b85d4e424ae44b828e313ca36fa1fc83cdc7f3eefd722cb89ed6d1b3caf385b921026d466a768d425c86687b79a28faa5297d4016b37c09d779bc0313d688e0f302453aeffffffff588e8c6727ec1c86f87573b0a520c050a97382110f7f1ab7bbaa7107dc3dcfb003000000b700483045022100dca89ed290294439c14171f9caa1441e257c8218fe810284f26b3e7466660afb02205489a8be711b165a6d1a2f61d415c118258aff2c1a35115ee7fbbdcb2a5c114a0100004c695221023c5cbb819b0bcb5c7bf8db592d4c1d15d1b8d14d49b444ba4e85131316b24d4c21022438d658cc970895bf05bb617fbf4036600fc716bec8adb92aeaa317edd1700d2102b650623b12f2407c25496559410dfd0624dda8b79908bc9d80402100406e4f4b53aeffffffff01a63bc3230000000017a91439c65a0d0072a140694d6b13ec5f5f2437de99ff8700000000000000000000000000000000000000", "coin": "tzec", "backupKey": "xpub661MyMwAqRbcFzLXuganogQvd7MrefQQqCcJP2ZDumnCdQecf5cw1P1nD5qBz8SNS1yCLSC9VqpNUWnQU3V6qmnPt2r21oXhicQFzPA6Lby", "recoveryAmount": 599997350, "recoveryAmountString": "599997350", - "txid": "060d71c03320fccb7379bc1bb777cc3a0ea22ba1a4729bcb5a76a51694d55d24" + "txid": "89d8bb20e631df47958c543a6187624fda8998e5561cc658e850e99f8218948e" } \ No newline at end of file diff --git a/modules/bitgo/test/v2/unit/coins/utxo/fixtures/tzec/recovery/backupKeyRecovery-p2sh-unsignedRecovery.json b/modules/bitgo/test/v2/unit/coins/utxo/fixtures/tzec/recovery/backupKeyRecovery-p2sh-unsignedRecovery.json index ced58fa94e..b2d8d7361d 100644 --- a/modules/bitgo/test/v2/unit/coins/utxo/fixtures/tzec/recovery/backupKeyRecovery-p2sh-unsignedRecovery.json +++ b/modules/bitgo/test/v2/unit/coins/utxo/fixtures/tzec/recovery/backupKeyRecovery-p2sh-unsignedRecovery.json @@ -1,9 +1,9 @@ { - "txHex": "0400008085202f890317ae2df874a4836f232700eac5170d3b1751f48307c20d718209af5b59f3c1e30000000000ffffffff18bd0d5d076ec551981e6b836c92eecabc50cc99be8533b9082e3a98587778f60200000000ffffffff1c4232ae7ebbf2640594d8597464fc46247769096922d832e1bb50a217da96550300000000ffffffff010c44c3230000000017a91439c65a0d0072a140694d6b13ec5f5f2437de99ff8700000000000000000000000000000000000000", + "txHex": "0400008085202f89034314e3e7ed401228011e2233978ffbf97c53e931dcba62c088214063f9c828980000000000ffffffffc8778952ad73645a0e82c49b427aba7b023222db20f4d39192978db5f6a0c8ad0200000000ffffffff588e8c6727ec1c86f87573b0a520c050a97382110f7f1ab7bbaa7107dc3dcfb00300000000ffffffff010c44c3230000000017a91439c65a0d0072a140694d6b13ec5f5f2437de99ff8700000000000000000000000000000000000000", "txInfo": { "unspents": [ { - "id": "e3c1f3595baf0982710dc20783f451173b0d17c5ea0027236f83a474f82dae17:0", + "id": "9828c8f963402188c062badc31e9537cf9fb8f9733221e01281240ede7e31443:0", "address": "t2ChBQL66RU2M9DnktwM1uZJB4BAeZTVZAQ", "value": 100000000, "chain": 1, @@ -11,7 +11,7 @@ "valueString": "100000000" }, { - "id": "f6787758983a2e08b93385be99cc50bccaee926c836b1e9851c56e075d0dbd18:2", + "id": "adc8a0f6b58d979291d3f420db2232027bba7a429bc4820e5a6473ad528977c8:2", "address": "t2CMZJUHkYjDncMtFBWs5GNdJ6DDnsLmM5p", "value": 200000000, "chain": 1, @@ -19,7 +19,7 @@ "valueString": "200000000" }, { - "id": "5596da17a250bbe132d822690969772446fc647459d8940564f2bb7eae32421c:3", + "id": "b0cf3ddc0771aabbb71a7f0f118273a950c020a5b07375f8861cec27678c8e58:3", "address": "t26vDQNkirotDDAxvLnJUaMnss61cu3WNJi", "value": 300000000, "chain": 1, @@ -30,5 +30,5 @@ }, "feeInfo": {}, "coin": "tzec", - "txid": "d211db7269a08a1aad837e69c1779fe1f6ae3e6bd5d5ff7e1ade7cabcb360035" + "txid": "69904166709e20082d694ab9d4efa46ecc70e4b82cb970b5ae8d01fcf68d1578" } \ No newline at end of file diff --git a/modules/bitgo/test/v2/unit/coins/utxo/fixtures/tzec/transactions-p2sh-p2sh.json b/modules/bitgo/test/v2/unit/coins/utxo/fixtures/tzec/transactions-p2sh-p2sh.json index 86c727d8fe..1b0ecabb62 100644 --- a/modules/bitgo/test/v2/unit/coins/utxo/fixtures/tzec/transactions-p2sh-p2sh.json +++ b/modules/bitgo/test/v2/unit/coins/utxo/fixtures/tzec/transactions-p2sh-p2sh.json @@ -24,19 +24,19 @@ ] }, "halfSignedUserBackup": { - "id": "42655f1f5e96b26dc485eacc3c81554ba9860dec103731ab5a486561e5a9ff7c", - "hex": "0400008085202f890273dbd32ce01f5f784c041e7625526724647d76a2e3d3a518c6b4499775765c7601000000b600473044022038fa5f2bfe57dc3bf1bfe7700d5541e4601de403534269f4ac0ab08e4be32c100220437e34f9451bee7e31c985c353f75f64c6c095e3bb0c0ec7f851c86e8ef559c60100004c69522102d06c08ccf0fddefff881e869b951d4b92e936118b3360182c5b8c55f4c40bc6121030795af84ecc10252d8a894f54845beeb5624a1c24c3747cc654bd430539dee3521029b30ebe8eb23f8cec82f25a80e3b423979ec3ba1fe07d9d4ed9f6361258bc31d53aeffffffff6afba284d708626b9c84b1dd8d33277820eef2446273d1c73f648d45ee4ef54501000000b6004730440220759faa41baa09a1ae24f2f16527d817740e6a6ec9874f86ac2bec5d50981d13202204f20423e350affac23bb79b7c773a971e07981262a461ebbff48fda2c2070f270100004c695221022a388ece509cad31a5bed9ff6142991fadc8529a57e388cd83b92421c3f8072f2103b1d138f39f76ee6b3132a9fb9d1cd1c78590effaf37eb43f0020ea614c7d733f21032a0963ad6630acd7222202d52862003403cb34727ead9fcc4b0732307a52ba6b53aeffffffff0118beeb0b0000000017a9141e57a925dd863a86af341037e700862bf66bf7b68700000000000000000000000000000000000000", + "id": "bcbfb9d10a361bc08050c55cfc3f940eed33baa7b822ecac38270c488cfdad2f", + "hex": "0400008085202f890273dbd32ce01f5f784c041e7625526724647d76a2e3d3a518c6b4499775765c7601000000b700483045022100f2ead70a1877da10554fa0012d410abd22839ebb983727590ffb584ab3e7cd60022065312e56579f6cc4cb64da25f9283bfd9054c0df0d364f67396f28ec3f3dde5e0100004c69522102d06c08ccf0fddefff881e869b951d4b92e936118b3360182c5b8c55f4c40bc6121030795af84ecc10252d8a894f54845beeb5624a1c24c3747cc654bd430539dee3521029b30ebe8eb23f8cec82f25a80e3b423979ec3ba1fe07d9d4ed9f6361258bc31d53aeffffffff6afba284d708626b9c84b1dd8d33277820eef2446273d1c73f648d45ee4ef54501000000b60047304402204cb2f5129adee61c0fe7602020dc3122fa7191e00dccf41140d9bc01aba4854e02202726cf1291295cd9381b5c3a8db47cafc6ae48d6de98609c1382edf6b473e0190100004c695221022a388ece509cad31a5bed9ff6142991fadc8529a57e388cd83b92421c3f8072f2103b1d138f39f76ee6b3132a9fb9d1cd1c78590effaf37eb43f0020ea614c7d733f21032a0963ad6630acd7222202d52862003403cb34727ead9fcc4b0732307a52ba6b53aeffffffff0118beeb0b0000000017a9141e57a925dd863a86af341037e700862bf66bf7b68700000000000000000000000000000000000000", "ins": [ { "txid": "765c76759749b4c618a5d3e3a2767d6424675225761e044c785f1fe02cd3db73", "index": 1, - "script": "00473044022038fa5f2bfe57dc3bf1bfe7700d5541e4601de403534269f4ac0ab08e4be32c100220437e34f9451bee7e31c985c353f75f64c6c095e3bb0c0ec7f851c86e8ef559c60100004c69522102d06c08ccf0fddefff881e869b951d4b92e936118b3360182c5b8c55f4c40bc6121030795af84ecc10252d8a894f54845beeb5624a1c24c3747cc654bd430539dee3521029b30ebe8eb23f8cec82f25a80e3b423979ec3ba1fe07d9d4ed9f6361258bc31d53ae", + "script": "00483045022100f2ead70a1877da10554fa0012d410abd22839ebb983727590ffb584ab3e7cd60022065312e56579f6cc4cb64da25f9283bfd9054c0df0d364f67396f28ec3f3dde5e0100004c69522102d06c08ccf0fddefff881e869b951d4b92e936118b3360182c5b8c55f4c40bc6121030795af84ecc10252d8a894f54845beeb5624a1c24c3747cc654bd430539dee3521029b30ebe8eb23f8cec82f25a80e3b423979ec3ba1fe07d9d4ed9f6361258bc31d53ae", "witness": [] }, { "txid": "45f54eee458d643fc7d1736244f2ee207827338dddb1849c6b6208d784a2fb6a", "index": 1, - "script": "004730440220759faa41baa09a1ae24f2f16527d817740e6a6ec9874f86ac2bec5d50981d13202204f20423e350affac23bb79b7c773a971e07981262a461ebbff48fda2c2070f270100004c695221022a388ece509cad31a5bed9ff6142991fadc8529a57e388cd83b92421c3f8072f2103b1d138f39f76ee6b3132a9fb9d1cd1c78590effaf37eb43f0020ea614c7d733f21032a0963ad6630acd7222202d52862003403cb34727ead9fcc4b0732307a52ba6b53ae", + "script": "0047304402204cb2f5129adee61c0fe7602020dc3122fa7191e00dccf41140d9bc01aba4854e02202726cf1291295cd9381b5c3a8db47cafc6ae48d6de98609c1382edf6b473e0190100004c695221022a388ece509cad31a5bed9ff6142991fadc8529a57e388cd83b92421c3f8072f2103b1d138f39f76ee6b3132a9fb9d1cd1c78590effaf37eb43f0020ea614c7d733f21032a0963ad6630acd7222202d52862003403cb34727ead9fcc4b0732307a52ba6b53ae", "witness": [] } ], @@ -48,19 +48,19 @@ ] }, "halfSignedUserBitGo": { - "id": "42655f1f5e96b26dc485eacc3c81554ba9860dec103731ab5a486561e5a9ff7c", - "hex": "0400008085202f890273dbd32ce01f5f784c041e7625526724647d76a2e3d3a518c6b4499775765c7601000000b600473044022038fa5f2bfe57dc3bf1bfe7700d5541e4601de403534269f4ac0ab08e4be32c100220437e34f9451bee7e31c985c353f75f64c6c095e3bb0c0ec7f851c86e8ef559c60100004c69522102d06c08ccf0fddefff881e869b951d4b92e936118b3360182c5b8c55f4c40bc6121030795af84ecc10252d8a894f54845beeb5624a1c24c3747cc654bd430539dee3521029b30ebe8eb23f8cec82f25a80e3b423979ec3ba1fe07d9d4ed9f6361258bc31d53aeffffffff6afba284d708626b9c84b1dd8d33277820eef2446273d1c73f648d45ee4ef54501000000b6004730440220759faa41baa09a1ae24f2f16527d817740e6a6ec9874f86ac2bec5d50981d13202204f20423e350affac23bb79b7c773a971e07981262a461ebbff48fda2c2070f270100004c695221022a388ece509cad31a5bed9ff6142991fadc8529a57e388cd83b92421c3f8072f2103b1d138f39f76ee6b3132a9fb9d1cd1c78590effaf37eb43f0020ea614c7d733f21032a0963ad6630acd7222202d52862003403cb34727ead9fcc4b0732307a52ba6b53aeffffffff0118beeb0b0000000017a9141e57a925dd863a86af341037e700862bf66bf7b68700000000000000000000000000000000000000", + "id": "bcbfb9d10a361bc08050c55cfc3f940eed33baa7b822ecac38270c488cfdad2f", + "hex": "0400008085202f890273dbd32ce01f5f784c041e7625526724647d76a2e3d3a518c6b4499775765c7601000000b700483045022100f2ead70a1877da10554fa0012d410abd22839ebb983727590ffb584ab3e7cd60022065312e56579f6cc4cb64da25f9283bfd9054c0df0d364f67396f28ec3f3dde5e0100004c69522102d06c08ccf0fddefff881e869b951d4b92e936118b3360182c5b8c55f4c40bc6121030795af84ecc10252d8a894f54845beeb5624a1c24c3747cc654bd430539dee3521029b30ebe8eb23f8cec82f25a80e3b423979ec3ba1fe07d9d4ed9f6361258bc31d53aeffffffff6afba284d708626b9c84b1dd8d33277820eef2446273d1c73f648d45ee4ef54501000000b60047304402204cb2f5129adee61c0fe7602020dc3122fa7191e00dccf41140d9bc01aba4854e02202726cf1291295cd9381b5c3a8db47cafc6ae48d6de98609c1382edf6b473e0190100004c695221022a388ece509cad31a5bed9ff6142991fadc8529a57e388cd83b92421c3f8072f2103b1d138f39f76ee6b3132a9fb9d1cd1c78590effaf37eb43f0020ea614c7d733f21032a0963ad6630acd7222202d52862003403cb34727ead9fcc4b0732307a52ba6b53aeffffffff0118beeb0b0000000017a9141e57a925dd863a86af341037e700862bf66bf7b68700000000000000000000000000000000000000", "ins": [ { "txid": "765c76759749b4c618a5d3e3a2767d6424675225761e044c785f1fe02cd3db73", "index": 1, - "script": "00473044022038fa5f2bfe57dc3bf1bfe7700d5541e4601de403534269f4ac0ab08e4be32c100220437e34f9451bee7e31c985c353f75f64c6c095e3bb0c0ec7f851c86e8ef559c60100004c69522102d06c08ccf0fddefff881e869b951d4b92e936118b3360182c5b8c55f4c40bc6121030795af84ecc10252d8a894f54845beeb5624a1c24c3747cc654bd430539dee3521029b30ebe8eb23f8cec82f25a80e3b423979ec3ba1fe07d9d4ed9f6361258bc31d53ae", + "script": "00483045022100f2ead70a1877da10554fa0012d410abd22839ebb983727590ffb584ab3e7cd60022065312e56579f6cc4cb64da25f9283bfd9054c0df0d364f67396f28ec3f3dde5e0100004c69522102d06c08ccf0fddefff881e869b951d4b92e936118b3360182c5b8c55f4c40bc6121030795af84ecc10252d8a894f54845beeb5624a1c24c3747cc654bd430539dee3521029b30ebe8eb23f8cec82f25a80e3b423979ec3ba1fe07d9d4ed9f6361258bc31d53ae", "witness": [] }, { "txid": "45f54eee458d643fc7d1736244f2ee207827338dddb1849c6b6208d784a2fb6a", "index": 1, - "script": "004730440220759faa41baa09a1ae24f2f16527d817740e6a6ec9874f86ac2bec5d50981d13202204f20423e350affac23bb79b7c773a971e07981262a461ebbff48fda2c2070f270100004c695221022a388ece509cad31a5bed9ff6142991fadc8529a57e388cd83b92421c3f8072f2103b1d138f39f76ee6b3132a9fb9d1cd1c78590effaf37eb43f0020ea614c7d733f21032a0963ad6630acd7222202d52862003403cb34727ead9fcc4b0732307a52ba6b53ae", + "script": "0047304402204cb2f5129adee61c0fe7602020dc3122fa7191e00dccf41140d9bc01aba4854e02202726cf1291295cd9381b5c3a8db47cafc6ae48d6de98609c1382edf6b473e0190100004c695221022a388ece509cad31a5bed9ff6142991fadc8529a57e388cd83b92421c3f8072f2103b1d138f39f76ee6b3132a9fb9d1cd1c78590effaf37eb43f0020ea614c7d733f21032a0963ad6630acd7222202d52862003403cb34727ead9fcc4b0732307a52ba6b53ae", "witness": [] } ], @@ -72,19 +72,19 @@ ] }, "fullSignedUserBackup": { - "id": "4474892d06c4ee0c111da34827fac95d58aee375c755ad9e0703d217333d7313", - "hex": "0400008085202f890273dbd32ce01f5f784c041e7625526724647d76a2e3d3a518c6b4499775765c7601000000fc00473044022038fa5f2bfe57dc3bf1bfe7700d5541e4601de403534269f4ac0ab08e4be32c100220437e34f9451bee7e31c985c353f75f64c6c095e3bb0c0ec7f851c86e8ef559c601473044022025a53ea55f93408baacc799b104d4ededdf136c26935eb748fa713159274f36a02204b4472111146a43041788899b198b62297180983f7ec2ce4c7e9b56a7ce3b48b014c69522102d06c08ccf0fddefff881e869b951d4b92e936118b3360182c5b8c55f4c40bc6121030795af84ecc10252d8a894f54845beeb5624a1c24c3747cc654bd430539dee3521029b30ebe8eb23f8cec82f25a80e3b423979ec3ba1fe07d9d4ed9f6361258bc31d53aeffffffff6afba284d708626b9c84b1dd8d33277820eef2446273d1c73f648d45ee4ef54501000000fc004730440220759faa41baa09a1ae24f2f16527d817740e6a6ec9874f86ac2bec5d50981d13202204f20423e350affac23bb79b7c773a971e07981262a461ebbff48fda2c2070f2701473044022028cb22fe0542297b0c1406f0cea18214c66860e183c04aeaedc9ebfd180695ae02203c73b91fd02fce2bbbda8fb0753533ccb53dae886ae1d69a1070fb85f8fdfa75014c695221022a388ece509cad31a5bed9ff6142991fadc8529a57e388cd83b92421c3f8072f2103b1d138f39f76ee6b3132a9fb9d1cd1c78590effaf37eb43f0020ea614c7d733f21032a0963ad6630acd7222202d52862003403cb34727ead9fcc4b0732307a52ba6b53aeffffffff0118beeb0b0000000017a9141e57a925dd863a86af341037e700862bf66bf7b68700000000000000000000000000000000000000", + "id": "e53108452a2542f261159e3d8a67c75d06799e92b438591061cf8b0d337adfef", + "hex": "0400008085202f890273dbd32ce01f5f784c041e7625526724647d76a2e3d3a518c6b4499775765c7601000000fdfd0000483045022100f2ead70a1877da10554fa0012d410abd22839ebb983727590ffb584ab3e7cd60022065312e56579f6cc4cb64da25f9283bfd9054c0df0d364f67396f28ec3f3dde5e0147304402205254a9a510da8fd06a2f9fce55bdc667c2f3a3736939ab67355e49e0c663969f02206c6de179455ac3dd4440f3bd032529ab3791541280b9793be86a8d38bfda8457014c69522102d06c08ccf0fddefff881e869b951d4b92e936118b3360182c5b8c55f4c40bc6121030795af84ecc10252d8a894f54845beeb5624a1c24c3747cc654bd430539dee3521029b30ebe8eb23f8cec82f25a80e3b423979ec3ba1fe07d9d4ed9f6361258bc31d53aeffffffff6afba284d708626b9c84b1dd8d33277820eef2446273d1c73f648d45ee4ef54501000000fdfd000047304402204cb2f5129adee61c0fe7602020dc3122fa7191e00dccf41140d9bc01aba4854e02202726cf1291295cd9381b5c3a8db47cafc6ae48d6de98609c1382edf6b473e01901483045022100d89ceb279083d8a50e86a79f1765161e6d82a6babfcf39b7c9c51f4954feea5a022054e791b2de34f62895fab526b21532aa461f1a0b1d3a899096fd2224d87c13a2014c695221022a388ece509cad31a5bed9ff6142991fadc8529a57e388cd83b92421c3f8072f2103b1d138f39f76ee6b3132a9fb9d1cd1c78590effaf37eb43f0020ea614c7d733f21032a0963ad6630acd7222202d52862003403cb34727ead9fcc4b0732307a52ba6b53aeffffffff0118beeb0b0000000017a9141e57a925dd863a86af341037e700862bf66bf7b68700000000000000000000000000000000000000", "ins": [ { "txid": "765c76759749b4c618a5d3e3a2767d6424675225761e044c785f1fe02cd3db73", "index": 1, - "script": "00473044022038fa5f2bfe57dc3bf1bfe7700d5541e4601de403534269f4ac0ab08e4be32c100220437e34f9451bee7e31c985c353f75f64c6c095e3bb0c0ec7f851c86e8ef559c601473044022025a53ea55f93408baacc799b104d4ededdf136c26935eb748fa713159274f36a02204b4472111146a43041788899b198b62297180983f7ec2ce4c7e9b56a7ce3b48b014c69522102d06c08ccf0fddefff881e869b951d4b92e936118b3360182c5b8c55f4c40bc6121030795af84ecc10252d8a894f54845beeb5624a1c24c3747cc654bd430539dee3521029b30ebe8eb23f8cec82f25a80e3b423979ec3ba1fe07d9d4ed9f6361258bc31d53ae", + "script": "00483045022100f2ead70a1877da10554fa0012d410abd22839ebb983727590ffb584ab3e7cd60022065312e56579f6cc4cb64da25f9283bfd9054c0df0d364f67396f28ec3f3dde5e0147304402205254a9a510da8fd06a2f9fce55bdc667c2f3a3736939ab67355e49e0c663969f02206c6de179455ac3dd4440f3bd032529ab3791541280b9793be86a8d38bfda8457014c69522102d06c08ccf0fddefff881e869b951d4b92e936118b3360182c5b8c55f4c40bc6121030795af84ecc10252d8a894f54845beeb5624a1c24c3747cc654bd430539dee3521029b30ebe8eb23f8cec82f25a80e3b423979ec3ba1fe07d9d4ed9f6361258bc31d53ae", "witness": [] }, { "txid": "45f54eee458d643fc7d1736244f2ee207827338dddb1849c6b6208d784a2fb6a", "index": 1, - "script": "004730440220759faa41baa09a1ae24f2f16527d817740e6a6ec9874f86ac2bec5d50981d13202204f20423e350affac23bb79b7c773a971e07981262a461ebbff48fda2c2070f2701473044022028cb22fe0542297b0c1406f0cea18214c66860e183c04aeaedc9ebfd180695ae02203c73b91fd02fce2bbbda8fb0753533ccb53dae886ae1d69a1070fb85f8fdfa75014c695221022a388ece509cad31a5bed9ff6142991fadc8529a57e388cd83b92421c3f8072f2103b1d138f39f76ee6b3132a9fb9d1cd1c78590effaf37eb43f0020ea614c7d733f21032a0963ad6630acd7222202d52862003403cb34727ead9fcc4b0732307a52ba6b53ae", + "script": "0047304402204cb2f5129adee61c0fe7602020dc3122fa7191e00dccf41140d9bc01aba4854e02202726cf1291295cd9381b5c3a8db47cafc6ae48d6de98609c1382edf6b473e01901483045022100d89ceb279083d8a50e86a79f1765161e6d82a6babfcf39b7c9c51f4954feea5a022054e791b2de34f62895fab526b21532aa461f1a0b1d3a899096fd2224d87c13a2014c695221022a388ece509cad31a5bed9ff6142991fadc8529a57e388cd83b92421c3f8072f2103b1d138f39f76ee6b3132a9fb9d1cd1c78590effaf37eb43f0020ea614c7d733f21032a0963ad6630acd7222202d52862003403cb34727ead9fcc4b0732307a52ba6b53ae", "witness": [] } ], @@ -96,19 +96,19 @@ ] }, "fullSignedUserBitGo": { - "id": "2d4ebeb3635dffe1c392e407636521688c35b838c42b8c6557ac7956f7fae46f", - "hex": "0400008085202f890273dbd32ce01f5f784c041e7625526724647d76a2e3d3a518c6b4499775765c7601000000fc00473044022038fa5f2bfe57dc3bf1bfe7700d5541e4601de403534269f4ac0ab08e4be32c100220437e34f9451bee7e31c985c353f75f64c6c095e3bb0c0ec7f851c86e8ef559c60147304402205f8f91e9c763c9aac3092f50fa57f5edb741819dbd4f93c891542aad4f4b8a2a02207bd31e468fbdcc5b4a4771860a20b0dd7b8cf68956dde197f8e66d42a28d5f76014c69522102d06c08ccf0fddefff881e869b951d4b92e936118b3360182c5b8c55f4c40bc6121030795af84ecc10252d8a894f54845beeb5624a1c24c3747cc654bd430539dee3521029b30ebe8eb23f8cec82f25a80e3b423979ec3ba1fe07d9d4ed9f6361258bc31d53aeffffffff6afba284d708626b9c84b1dd8d33277820eef2446273d1c73f648d45ee4ef54501000000fdfd00004730440220759faa41baa09a1ae24f2f16527d817740e6a6ec9874f86ac2bec5d50981d13202204f20423e350affac23bb79b7c773a971e07981262a461ebbff48fda2c2070f2701483045022100efaed41b2a4237a5c1f9a947c7b7a1a83514435d0aaae8c89a46e2460a3d7c2f022011d0629d5e7484049076b7f8acdae9f20c54c0d0a725f19b821ecf0e245e5d4c014c695221022a388ece509cad31a5bed9ff6142991fadc8529a57e388cd83b92421c3f8072f2103b1d138f39f76ee6b3132a9fb9d1cd1c78590effaf37eb43f0020ea614c7d733f21032a0963ad6630acd7222202d52862003403cb34727ead9fcc4b0732307a52ba6b53aeffffffff0118beeb0b0000000017a9141e57a925dd863a86af341037e700862bf66bf7b68700000000000000000000000000000000000000", + "id": "2b334f845de7a2ceb9a21d23933a363713144351ebc1f839c86a5128eadab3ff", + "hex": "0400008085202f890273dbd32ce01f5f784c041e7625526724647d76a2e3d3a518c6b4499775765c7601000000fdfe0000483045022100f2ead70a1877da10554fa0012d410abd22839ebb983727590ffb584ab3e7cd60022065312e56579f6cc4cb64da25f9283bfd9054c0df0d364f67396f28ec3f3dde5e01483045022100d726aa5075afaacd078ed8f32d8342b72053875426a56f1ea0a0f8365c3dd80d0220160e08a3665bdf8f73ed51f398f421789c46817264d6a75b019518c9cef8b685014c69522102d06c08ccf0fddefff881e869b951d4b92e936118b3360182c5b8c55f4c40bc6121030795af84ecc10252d8a894f54845beeb5624a1c24c3747cc654bd430539dee3521029b30ebe8eb23f8cec82f25a80e3b423979ec3ba1fe07d9d4ed9f6361258bc31d53aeffffffff6afba284d708626b9c84b1dd8d33277820eef2446273d1c73f648d45ee4ef54501000000fc0047304402204cb2f5129adee61c0fe7602020dc3122fa7191e00dccf41140d9bc01aba4854e02202726cf1291295cd9381b5c3a8db47cafc6ae48d6de98609c1382edf6b473e0190147304402204ad04853a79e50d08bd35d0c762bd712c548f59bb0fda4168015f016c55065d80220430da898e9146c9eceed70da933c9fd17657fa8dd15d01cfc98bc7a4ac7dc5c1014c695221022a388ece509cad31a5bed9ff6142991fadc8529a57e388cd83b92421c3f8072f2103b1d138f39f76ee6b3132a9fb9d1cd1c78590effaf37eb43f0020ea614c7d733f21032a0963ad6630acd7222202d52862003403cb34727ead9fcc4b0732307a52ba6b53aeffffffff0118beeb0b0000000017a9141e57a925dd863a86af341037e700862bf66bf7b68700000000000000000000000000000000000000", "ins": [ { "txid": "765c76759749b4c618a5d3e3a2767d6424675225761e044c785f1fe02cd3db73", "index": 1, - "script": "00473044022038fa5f2bfe57dc3bf1bfe7700d5541e4601de403534269f4ac0ab08e4be32c100220437e34f9451bee7e31c985c353f75f64c6c095e3bb0c0ec7f851c86e8ef559c60147304402205f8f91e9c763c9aac3092f50fa57f5edb741819dbd4f93c891542aad4f4b8a2a02207bd31e468fbdcc5b4a4771860a20b0dd7b8cf68956dde197f8e66d42a28d5f76014c69522102d06c08ccf0fddefff881e869b951d4b92e936118b3360182c5b8c55f4c40bc6121030795af84ecc10252d8a894f54845beeb5624a1c24c3747cc654bd430539dee3521029b30ebe8eb23f8cec82f25a80e3b423979ec3ba1fe07d9d4ed9f6361258bc31d53ae", + "script": "00483045022100f2ead70a1877da10554fa0012d410abd22839ebb983727590ffb584ab3e7cd60022065312e56579f6cc4cb64da25f9283bfd9054c0df0d364f67396f28ec3f3dde5e01483045022100d726aa5075afaacd078ed8f32d8342b72053875426a56f1ea0a0f8365c3dd80d0220160e08a3665bdf8f73ed51f398f421789c46817264d6a75b019518c9cef8b685014c69522102d06c08ccf0fddefff881e869b951d4b92e936118b3360182c5b8c55f4c40bc6121030795af84ecc10252d8a894f54845beeb5624a1c24c3747cc654bd430539dee3521029b30ebe8eb23f8cec82f25a80e3b423979ec3ba1fe07d9d4ed9f6361258bc31d53ae", "witness": [] }, { "txid": "45f54eee458d643fc7d1736244f2ee207827338dddb1849c6b6208d784a2fb6a", "index": 1, - "script": "004730440220759faa41baa09a1ae24f2f16527d817740e6a6ec9874f86ac2bec5d50981d13202204f20423e350affac23bb79b7c773a971e07981262a461ebbff48fda2c2070f2701483045022100efaed41b2a4237a5c1f9a947c7b7a1a83514435d0aaae8c89a46e2460a3d7c2f022011d0629d5e7484049076b7f8acdae9f20c54c0d0a725f19b821ecf0e245e5d4c014c695221022a388ece509cad31a5bed9ff6142991fadc8529a57e388cd83b92421c3f8072f2103b1d138f39f76ee6b3132a9fb9d1cd1c78590effaf37eb43f0020ea614c7d733f21032a0963ad6630acd7222202d52862003403cb34727ead9fcc4b0732307a52ba6b53ae", + "script": "0047304402204cb2f5129adee61c0fe7602020dc3122fa7191e00dccf41140d9bc01aba4854e02202726cf1291295cd9381b5c3a8db47cafc6ae48d6de98609c1382edf6b473e0190147304402204ad04853a79e50d08bd35d0c762bd712c548f59bb0fda4168015f016c55065d80220430da898e9146c9eceed70da933c9fd17657fa8dd15d01cfc98bc7a4ac7dc5c1014c695221022a388ece509cad31a5bed9ff6142991fadc8529a57e388cd83b92421c3f8072f2103b1d138f39f76ee6b3132a9fb9d1cd1c78590effaf37eb43f0020ea614c7d733f21032a0963ad6630acd7222202d52862003403cb34727ead9fcc4b0732307a52ba6b53ae", "witness": [] } ], diff --git a/modules/bitgo/test/v2/unit/coins/utxo/recovery/backupKeyRecovery.ts b/modules/bitgo/test/v2/unit/coins/utxo/recovery/backupKeyRecovery.ts index 9a8d48c625..65741af894 100644 --- a/modules/bitgo/test/v2/unit/coins/utxo/recovery/backupKeyRecovery.ts +++ b/modules/bitgo/test/v2/unit/coins/utxo/recovery/backupKeyRecovery.ts @@ -284,7 +284,6 @@ function run( utxoCoins.forEach((coin) => { const walletKeys = getDefaultWalletKeys(); - getScriptTypes2Of3().forEach((scriptType) => { run( coin, diff --git a/modules/utxo-lib/src/bitgo/transaction.ts b/modules/utxo-lib/src/bitgo/transaction.ts index 1ebff4f1a8..967b4a101f 100644 --- a/modules/utxo-lib/src/bitgo/transaction.ts +++ b/modules/utxo-lib/src/bitgo/transaction.ts @@ -154,10 +154,10 @@ export function createPsbtFromTransaction(tx: UtxoTransaction, prevOuts: } export function getDefaultTransactionVersion(network: Network): number { - // Use NU6 version for testnet, activated on mainnet in block 2726400 - // https://zips.z.cash/zip-0253 + // Use NU6_1 version for both mainnet and testnet + // https://zips.z.cash/zip-0255 if (network === networks.zcashTest) { - return ZcashTransaction.VERSION4_BRANCH_NU6; + return ZcashTransaction.VERSION4_BRANCH_NU6_1; } switch (getMainnet(network)) { @@ -218,8 +218,10 @@ export function setPsbtDefaults( ZcashTransaction.VERSION4_BRANCH_CANOPY, ZcashTransaction.VERSION4_BRANCH_NU5, ZcashTransaction.VERSION4_BRANCH_NU6, + ZcashTransaction.VERSION4_BRANCH_NU6_1, ZcashTransaction.VERSION5_BRANCH_NU5, ZcashTransaction.VERSION5_BRANCH_NU6, + ZcashTransaction.VERSION5_BRANCH_NU6_1, ].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 9092c9a401..b5872ac63f 100644 --- a/modules/utxo-lib/src/bitgo/zcash/ZcashPsbt.ts +++ b/modules/utxo-lib/src/bitgo/zcash/ZcashPsbt.ts @@ -108,11 +108,13 @@ export class ZcashPsbt extends UtxoPsbt> { case ZcashTransaction.VERSION4_BRANCH_CANOPY: case ZcashTransaction.VERSION4_BRANCH_NU5: case ZcashTransaction.VERSION4_BRANCH_NU6: + case ZcashTransaction.VERSION4_BRANCH_NU6_1: this.setVersion(4); break; case 5: case ZcashTransaction.VERSION5_BRANCH_NU5: case ZcashTransaction.VERSION5_BRANCH_NU6: + case ZcashTransaction.VERSION5_BRANCH_NU6_1: 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 82e116bc38..0bfd277cba 100644 --- a/modules/utxo-lib/src/bitgo/zcash/ZcashTransaction.ts +++ b/modules/utxo-lib/src/bitgo/zcash/ZcashTransaction.ts @@ -24,6 +24,7 @@ const OVERWINTER_BRANCH_ID = 0x5ba81b19; 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 export class UnsupportedTransactionError extends Error { constructor(message: string) { @@ -36,15 +37,25 @@ export function getDefaultVersionGroupIdForVersion(version: number): number { case 400: case 450: case 455: + case 456: return SAPLING_VERSION_GROUP_ID; case 500: case 550: + case 551: 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 + if (network === networks.zcashTest) { + if (version === 4 || version === 5) { + return NU6_1_BRANCH_ID; + } + } + switch (version) { case 1: case 2: @@ -59,12 +70,16 @@ export function getDefaultConsensusBranchIdForVersion(network: ZcashNetwork, ver // https://zips.z.cash/zip-0252 // NU5 is deprecated on mainnet on block 2726400 return NU5_BRANCH_ID; - case 4: - case 5: case ZcashTransaction.VERSION4_BRANCH_NU6: case ZcashTransaction.VERSION5_BRANCH_NU6: + case 4: + case 5: // https://zips.z.cash/zip-0253 return NU6_BRANCH_ID; + case ZcashTransaction.VERSION4_BRANCH_NU6_1: + case ZcashTransaction.VERSION5_BRANCH_NU6_1: + // https://zips.z.cash/zip-0255 + return NU6_1_BRANCH_ID; } throw new Error(`no value for version ${version}`); } @@ -77,8 +92,10 @@ export class ZcashTransaction extends static VERSION4_BRANCH_CANOPY = 400; static VERSION4_BRANCH_NU5 = 450; static VERSION4_BRANCH_NU6 = 455; + static VERSION4_BRANCH_NU6_1 = 456; static VERSION5_BRANCH_NU5 = 500; static VERSION5_BRANCH_NU6 = 550; + static VERSION5_BRANCH_NU6_1 = 551; // 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 6171bb1dbc..63b1657a09 100644 --- a/modules/utxo-lib/src/bitgo/zcash/ZcashTransactionBuilder.ts +++ b/modules/utxo-lib/src/bitgo/zcash/ZcashTransactionBuilder.ts @@ -73,11 +73,13 @@ export class ZcashTransactionBuilder e case ZcashTransaction.VERSION4_BRANCH_CANOPY: case ZcashTransaction.VERSION4_BRANCH_NU5: case ZcashTransaction.VERSION4_BRANCH_NU6: + case ZcashTransaction.VERSION4_BRANCH_NU6_1: this.setVersion(4); break; case 5: case ZcashTransaction.VERSION5_BRANCH_NU5: case ZcashTransaction.VERSION5_BRANCH_NU6: + case ZcashTransaction.VERSION5_BRANCH_NU6_1: this.setVersion(5); break; default: diff --git a/modules/utxo-lib/test/bitgo/psbt/ZcashPsbt.ts b/modules/utxo-lib/test/bitgo/psbt/ZcashPsbt.ts index 6d2d91a891..59dc6ad0b6 100644 --- a/modules/utxo-lib/test/bitgo/psbt/ZcashPsbt.ts +++ b/modules/utxo-lib/test/bitgo/psbt/ZcashPsbt.ts @@ -29,7 +29,7 @@ describe('Zcash PSBT', function () { assert.deepStrictEqual(psbt.toHex(), psbt.toBuffer().toString('hex')); }); } - [400, 450, 455, 500, 550].forEach((version) => testToHexForVersion(version)); + [400, 450, 455, 456, 500, 550, 551].forEach((version) => testToHexForVersion(version)); function testFromHexForVersion(version: number) { it(`version ${version} should deserialize from toHex`, async function () { @@ -39,7 +39,7 @@ describe('Zcash PSBT', function () { assert.deepStrictEqual(psbt2Hex, psbtHex); }); } - [400, 450, 455, 500, 550].forEach((version) => testFromHexForVersion(version)); + [400, 450, 455, 456, 500, 550, 551].forEach((version) => testFromHexForVersion(version)); }); describe('should be able to sign the transaction', function () { diff --git a/modules/utxo-lib/test/integration_local_rpc/parse.ts b/modules/utxo-lib/test/integration_local_rpc/parse.ts index 05dbd3b3b5..88b671da65 100644 --- a/modules/utxo-lib/test/integration_local_rpc/parse.ts +++ b/modules/utxo-lib/test/integration_local_rpc/parse.ts @@ -302,7 +302,7 @@ describe(`regtest fixtures`, function () { it('tests default version', function () { // FIXME(BTC-1633): fix generating fixtures for version 455 NU6 if (networks.zcashTest === network) { - assert.strictEqual(getDefaultTransactionVersion(network), 455); + assert.strictEqual(getDefaultTransactionVersion(network), 456); } else { assert.strictEqual(allVersions.filter((v) => v === getDefaultTransactionVersion(network)).length, 1); }