Merge pull request #34 from Zondax/test_signature

extending signature verification tests
Zondax · Sep 8, 2020 · 216e702 · 216e702
2 parents de78f06 + 923e18f
commit 216e702
Show file tree

Hide file tree

Showing 132 changed files with 90 additions and 29 deletions.
diff --git a/app/Makefile b/app/Makefile
@@ -47,7 +47,7 @@ COIN=STX
 endif
 
 APPVERSION_M=0
-APPVERSION_N=8
+APPVERSION_N=9
 APPVERSION_P=0
 
 $(info COIN      = [$(COIN)])

diff --git a/app/src/common/actions.h b/app/src/common/actions.h
@@ -48,9 +48,9 @@
 
 // The data required to calculate the post_sighash hash
 // 32-byte presig_hash calculated above
-// 1-byte publik ky encoding.It is 0x00(compressed)
-// 65-byte ECDSA signature
-#define POST_SIGNHASH_DATA_LEN 32 + 1 + 65
+// 1-byte publicKey encoding. It seems to be 0x00(compressed)
+// according to the blockstack's rust implementation
+#define POST_SIGNHASH_DATA_LEN CX_SHA256_SIZE + 1
 
 extern uint8_t action_addr_len;
 
@@ -75,13 +75,24 @@ __Z_INLINE void app_sign() {
     memcpy(post_sighash_data, presig_hash, CX_SHA256_SIZE);
 
     // set the signing public key's encoding byte, it is compressed
-    post_sighash_data[CX_SHA256_SIZE] = 0x00; // migth be 0x02
-    // copy the ECDSA (r,s,v) signature
-    memcpy(&post_sighash_data[CX_SHA256_SIZE + 1], &G_io_apdu_buffer[32], 65);
+    post_sighash_data[CX_SHA256_SIZE] = 0x00;
 
     // Now gets the post_sighash from the data and write it down to the first 32-byte of the  G_io_apdu_buffer
     uint8_t hash_temp[SHA512_DIGEST_LENGTH];
-    SHA512_256(post_sighash_data, POST_SIGNHASH_DATA_LEN, hash_temp);
+
+    // Now get the presig_hash
+    sha512_256_ctx ctx;
+    SHA512_256_init(&ctx);
+    SHA512_256_starts(&ctx);
+
+    // sighash + pubkey encoding
+    SHA512_256_update(&ctx, post_sighash_data, POST_SIGNHASH_DATA_LEN);
+    // the signature's v value
+    SHA512_256_update(&ctx, &G_io_apdu_buffer[96], 1);
+
+    // the signature's rs values
+    SHA512_256_update(&ctx, &G_io_apdu_buffer[32], 64);
+    SHA512_256_finish(&ctx, hash_temp);
     memcpy(G_io_apdu_buffer, hash_temp, CX_SHA256_SIZE);
 
     if (replyLen > 0) {

diff --git a/js/src/helperV1.ts b/js/src/helperV1.ts
@@ -80,11 +80,15 @@ export async function signSendChunkv1(
       if (response.length > 2) {
           const  postSignHash = response.slice(0, 32);
           const  signatureCompact = response.slice(32, 97);
+          var    signatureVRS = Buffer.alloc(65);
+          signatureVRS[0] = signatureCompact[signatureCompact.length - 1];
+          signatureCompact.copy(signatureVRS, 1, 0, 64);
           const  signatureDER = response.slice(97, response.length - 2);
 
           return {
               postSignHash,
               signatureCompact,
+              signatureVRS,
               signatureDER,
               returnCode: returnCode,
               errorMessage: errorMessage,

diff --git a/js/src/types.ts b/js/src/types.ts
@@ -33,5 +33,6 @@ export interface ResponseAppInfo extends ResponseBase {
 export interface ResponseSign extends ResponseBase {
   postSignHash: Buffer;
   signatureCompact: Buffer;
+  signatureVRS: Buffer,
   signatureDER: Buffer;
 }
diff --git a/tests_zemu/package.json b/tests_zemu/package.json
@@ -18,7 +18,7 @@
   "dependencies": {
     "@blockstack/stacks-transactions": "^0.6.0-test.1",
     "@zondax/ledger-blockstack": "^0.0.1",
-    "@zondax/zemu": "^0.5.1",
+    "@zondax/zemu": "^0.7.0",
     "bn.js": "^5.1.3"
   },
   "devDependencies": {

diff --git a/tests_zemu/snapshots/show-address/0.png → tests_zemu/snapshots/show-address/00000.png b/tests_zemu/snapshots/show-address/0.png → tests_zemu/snapshots/show-address/00000.png
diff --git a/tests_zemu/snapshots/show-address/1.png → tests_zemu/snapshots/show-address/00001.png b/tests_zemu/snapshots/show-address/1.png → tests_zemu/snapshots/show-address/00001.png
diff --git a/tests_zemu/snapshots/show-address/2.png → tests_zemu/snapshots/show-address/00002.png b/tests_zemu/snapshots/show-address/2.png → tests_zemu/snapshots/show-address/00002.png
diff --git a/tests_zemu/snapshots/show-address/3.png → tests_zemu/snapshots/show-address/00003.png b/tests_zemu/snapshots/show-address/3.png → tests_zemu/snapshots/show-address/00003.png
diff --git a/tests_zemu/snapshots/sign/0.png → tests_zemu/snapshots/sign/00000.png b/tests_zemu/snapshots/sign/0.png → tests_zemu/snapshots/sign/00000.png
diff --git a/tests_zemu/snapshots/sign/1.png → tests_zemu/snapshots/sign/00001.png b/tests_zemu/snapshots/sign/1.png → tests_zemu/snapshots/sign/00001.png
diff --git a/tests_zemu/snapshots/sign/2.png → tests_zemu/snapshots/sign/00002.png b/tests_zemu/snapshots/sign/2.png → tests_zemu/snapshots/sign/00002.png
diff --git a/tests_zemu/snapshots/sign/3.png → tests_zemu/snapshots/sign/00003.png b/tests_zemu/snapshots/sign/3.png → tests_zemu/snapshots/sign/00003.png
diff --git a/tests_zemu/snapshots/sign/4.png → tests_zemu/snapshots/sign/00004.png b/tests_zemu/snapshots/sign/4.png → tests_zemu/snapshots/sign/00004.png
diff --git a/tests_zemu/snapshots/sign/5.png → tests_zemu/snapshots/sign/00005.png b/tests_zemu/snapshots/sign/5.png → tests_zemu/snapshots/sign/00005.png
diff --git a/tests_zemu/snapshots/sign/6.png → tests_zemu/snapshots/sign/00006.png b/tests_zemu/snapshots/sign/6.png → tests_zemu/snapshots/sign/00006.png
diff --git a/tests_zemu/snapshots/sign/7.png → tests_zemu/snapshots/sign/00007.png b/tests_zemu/snapshots/sign/7.png → tests_zemu/snapshots/sign/00007.png
diff --git a/tests_zemu/snapshots/sign/8.png → tests_zemu/snapshots/sign/00008.png b/tests_zemu/snapshots/sign/8.png → tests_zemu/snapshots/sign/00008.png
diff --git a/tests_zemu/snapshots/sign/9.png → tests_zemu/snapshots/sign/00009.png b/tests_zemu/snapshots/sign/9.png → tests_zemu/snapshots/sign/00009.png
diff --git a/...contract_call_with_postcondition_tx/0.png → ...ract_call_with_postcondition_tx/00000.png b/...contract_call_with_postcondition_tx/0.png → ...ract_call_with_postcondition_tx/00000.png
diff --git a/...contract_call_with_postcondition_tx/1.png → ...ract_call_with_postcondition_tx/00001.png b/...contract_call_with_postcondition_tx/1.png → ...ract_call_with_postcondition_tx/00001.png
diff --git a/...contract_call_with_postcondition_tx/2.png → ...ract_call_with_postcondition_tx/00002.png b/...contract_call_with_postcondition_tx/2.png → ...ract_call_with_postcondition_tx/00002.png
diff --git a/...contract_call_with_postcondition_tx/3.png → ...ract_call_with_postcondition_tx/00003.png b/...contract_call_with_postcondition_tx/3.png → ...ract_call_with_postcondition_tx/00003.png
diff --git a/...contract_call_with_postcondition_tx/4.png → ...ract_call_with_postcondition_tx/00004.png b/...contract_call_with_postcondition_tx/4.png → ...ract_call_with_postcondition_tx/00004.png
diff --git a/...contract_call_with_postcondition_tx/5.png → ...ract_call_with_postcondition_tx/00005.png b/...contract_call_with_postcondition_tx/5.png → ...ract_call_with_postcondition_tx/00005.png
diff --git a/...contract_call_with_postcondition_tx/6.png → ...ract_call_with_postcondition_tx/00006.png b/...contract_call_with_postcondition_tx/6.png → ...ract_call_with_postcondition_tx/00006.png
diff --git a/...contract_call_with_postcondition_tx/7.png → ...ract_call_with_postcondition_tx/00007.png b/...contract_call_with_postcondition_tx/7.png → ...ract_call_with_postcondition_tx/00007.png
diff --git a/...contract_call_with_postcondition_tx/8.png → ...ract_call_with_postcondition_tx/00008.png b/...contract_call_with_postcondition_tx/8.png → ...ract_call_with_postcondition_tx/00008.png
diff --git a/...contract_call_with_postcondition_tx/9.png → ...ract_call_with_postcondition_tx/00009.png b/...contract_call_with_postcondition_tx/9.png → ...ract_call_with_postcondition_tx/00009.png
diff --git a/...ontract_call_with_postcondition_tx/10.png → ...ract_call_with_postcondition_tx/00010.png b/...ontract_call_with_postcondition_tx/10.png → ...ract_call_with_postcondition_tx/00010.png
diff --git a/...ontract_call_with_postcondition_tx/11.png → ...ract_call_with_postcondition_tx/00011.png b/...ontract_call_with_postcondition_tx/11.png → ...ract_call_with_postcondition_tx/00011.png
diff --git a/...ontract_call_with_postcondition_tx/12.png → ...ract_call_with_postcondition_tx/00012.png b/...ontract_call_with_postcondition_tx/12.png → ...ract_call_with_postcondition_tx/00012.png
diff --git a/...ontract_call_with_postcondition_tx/13.png → ...ract_call_with_postcondition_tx/00013.png b/...ontract_call_with_postcondition_tx/13.png → ...ract_call_with_postcondition_tx/00013.png
diff --git a/...ontract_call_with_postcondition_tx/14.png → ...ract_call_with_postcondition_tx/00014.png b/...ontract_call_with_postcondition_tx/14.png → ...ract_call_with_postcondition_tx/00014.png
diff --git a/...ots/sign_sponsored_contract_call_tx/0.png → ...sign_sponsored_contract_call_tx/00000.png b/...ots/sign_sponsored_contract_call_tx/0.png → ...sign_sponsored_contract_call_tx/00000.png
diff --git a/...ots/sign_sponsored_contract_call_tx/1.png → ...sign_sponsored_contract_call_tx/00001.png b/...ots/sign_sponsored_contract_call_tx/1.png → ...sign_sponsored_contract_call_tx/00001.png
diff --git a/...ots/sign_sponsored_contract_call_tx/2.png → ...sign_sponsored_contract_call_tx/00002.png b/...ots/sign_sponsored_contract_call_tx/2.png → ...sign_sponsored_contract_call_tx/00002.png
diff --git a/...ots/sign_sponsored_contract_call_tx/3.png → ...sign_sponsored_contract_call_tx/00003.png b/...ots/sign_sponsored_contract_call_tx/3.png → ...sign_sponsored_contract_call_tx/00003.png
diff --git a/...ots/sign_sponsored_contract_call_tx/4.png → ...sign_sponsored_contract_call_tx/00004.png b/...ots/sign_sponsored_contract_call_tx/4.png → ...sign_sponsored_contract_call_tx/00004.png
diff --git a/...ots/sign_sponsored_contract_call_tx/5.png → ...sign_sponsored_contract_call_tx/00005.png b/...ots/sign_sponsored_contract_call_tx/5.png → ...sign_sponsored_contract_call_tx/00005.png
diff --git a/...ots/sign_sponsored_contract_call_tx/6.png → ...sign_sponsored_contract_call_tx/00006.png b/...ots/sign_sponsored_contract_call_tx/6.png → ...sign_sponsored_contract_call_tx/00006.png
diff --git a/...ots/sign_sponsored_contract_call_tx/7.png → ...sign_sponsored_contract_call_tx/00007.png b/...ots/sign_sponsored_contract_call_tx/7.png → ...sign_sponsored_contract_call_tx/00007.png
diff --git a/...ots/sign_sponsored_contract_call_tx/8.png → ...sign_sponsored_contract_call_tx/00008.png b/...ots/sign_sponsored_contract_call_tx/8.png → ...sign_sponsored_contract_call_tx/00008.png
diff --git a/...ots/sign_sponsored_contract_call_tx/9.png → ...sign_sponsored_contract_call_tx/00009.png b/...ots/sign_sponsored_contract_call_tx/9.png → ...sign_sponsored_contract_call_tx/00009.png
diff --git a/...tract_call_tx_with_7_postconditions/0.png → ...t_call_tx_with_7_postconditions/00000.png b/...tract_call_tx_with_7_postconditions/0.png → ...t_call_tx_with_7_postconditions/00000.png
diff --git a/...tract_call_tx_with_7_postconditions/1.png → ...t_call_tx_with_7_postconditions/00001.png b/...tract_call_tx_with_7_postconditions/1.png → ...t_call_tx_with_7_postconditions/00001.png
diff --git a/...tract_call_tx_with_7_postconditions/2.png → ...t_call_tx_with_7_postconditions/00002.png b/...tract_call_tx_with_7_postconditions/2.png → ...t_call_tx_with_7_postconditions/00002.png
diff --git a/...tract_call_tx_with_7_postconditions/3.png → ...t_call_tx_with_7_postconditions/00003.png b/...tract_call_tx_with_7_postconditions/3.png → ...t_call_tx_with_7_postconditions/00003.png
diff --git a/...tract_call_tx_with_7_postconditions/4.png → ...t_call_tx_with_7_postconditions/00004.png b/...tract_call_tx_with_7_postconditions/4.png → ...t_call_tx_with_7_postconditions/00004.png
diff --git a/...tract_call_tx_with_7_postconditions/5.png → ...t_call_tx_with_7_postconditions/00005.png b/...tract_call_tx_with_7_postconditions/5.png → ...t_call_tx_with_7_postconditions/00005.png
diff --git a/...tract_call_tx_with_7_postconditions/6.png → ...t_call_tx_with_7_postconditions/00006.png b/...tract_call_tx_with_7_postconditions/6.png → ...t_call_tx_with_7_postconditions/00006.png
diff --git a/...tract_call_tx_with_7_postconditions/7.png → ...t_call_tx_with_7_postconditions/00007.png b/...tract_call_tx_with_7_postconditions/7.png → ...t_call_tx_with_7_postconditions/00007.png
diff --git a/...ract_call_tx_with_7_postconditions/17.png → ...t_call_tx_with_7_postconditions/00008.png b/...ract_call_tx_with_7_postconditions/17.png → ...t_call_tx_with_7_postconditions/00008.png
diff --git a/...ract_call_tx_with_7_postconditions/18.png → ...t_call_tx_with_7_postconditions/00009.png b/...ract_call_tx_with_7_postconditions/18.png → ...t_call_tx_with_7_postconditions/00009.png
diff --git a/...ract_call_tx_with_7_postconditions/10.png → ...t_call_tx_with_7_postconditions/00010.png b/...ract_call_tx_with_7_postconditions/10.png → ...t_call_tx_with_7_postconditions/00010.png
diff --git a/...ract_call_tx_with_7_postconditions/11.png → ...t_call_tx_with_7_postconditions/00011.png b/...ract_call_tx_with_7_postconditions/11.png → ...t_call_tx_with_7_postconditions/00011.png
diff --git a/...ract_call_tx_with_7_postconditions/12.png → ...t_call_tx_with_7_postconditions/00012.png b/...ract_call_tx_with_7_postconditions/12.png → ...t_call_tx_with_7_postconditions/00012.png
diff --git a/...ract_call_tx_with_7_postconditions/13.png → ...t_call_tx_with_7_postconditions/00013.png b/...ract_call_tx_with_7_postconditions/13.png → ...t_call_tx_with_7_postconditions/00013.png
diff --git a/...ract_call_tx_with_7_postconditions/14.png → ...t_call_tx_with_7_postconditions/00014.png b/...ract_call_tx_with_7_postconditions/14.png → ...t_call_tx_with_7_postconditions/00014.png
diff --git a/...ract_call_tx_with_7_postconditions/15.png → ...t_call_tx_with_7_postconditions/00015.png b/...ract_call_tx_with_7_postconditions/15.png → ...t_call_tx_with_7_postconditions/00015.png
diff --git a/...ract_call_tx_with_7_postconditions/16.png → ...t_call_tx_with_7_postconditions/00016.png b/...ract_call_tx_with_7_postconditions/16.png → ...t_call_tx_with_7_postconditions/00016.png
diff --git a/...ract_call_tx_with_7_postconditions/26.png → ...t_call_tx_with_7_postconditions/00017.png b/...ract_call_tx_with_7_postconditions/26.png → ...t_call_tx_with_7_postconditions/00017.png
diff --git a/...ract_call_tx_with_7_postconditions/27.png → ...t_call_tx_with_7_postconditions/00018.png b/...ract_call_tx_with_7_postconditions/27.png → ...t_call_tx_with_7_postconditions/00018.png
diff --git a/...ract_call_tx_with_7_postconditions/19.png → ...t_call_tx_with_7_postconditions/00019.png b/...ract_call_tx_with_7_postconditions/19.png → ...t_call_tx_with_7_postconditions/00019.png
diff --git a/...ract_call_tx_with_7_postconditions/20.png → ...t_call_tx_with_7_postconditions/00020.png b/...ract_call_tx_with_7_postconditions/20.png → ...t_call_tx_with_7_postconditions/00020.png
diff --git a/...ract_call_tx_with_7_postconditions/21.png → ...t_call_tx_with_7_postconditions/00021.png b/...ract_call_tx_with_7_postconditions/21.png → ...t_call_tx_with_7_postconditions/00021.png
diff --git a/...ract_call_tx_with_7_postconditions/22.png → ...t_call_tx_with_7_postconditions/00022.png b/...ract_call_tx_with_7_postconditions/22.png → ...t_call_tx_with_7_postconditions/00022.png
diff --git a/...ract_call_tx_with_7_postconditions/23.png → ...t_call_tx_with_7_postconditions/00023.png b/...ract_call_tx_with_7_postconditions/23.png → ...t_call_tx_with_7_postconditions/00023.png
diff --git a/...ract_call_tx_with_7_postconditions/24.png → ...t_call_tx_with_7_postconditions/00024.png b/...ract_call_tx_with_7_postconditions/24.png → ...t_call_tx_with_7_postconditions/00024.png
diff --git a/...ract_call_tx_with_7_postconditions/25.png → ...t_call_tx_with_7_postconditions/00025.png b/...ract_call_tx_with_7_postconditions/25.png → ...t_call_tx_with_7_postconditions/00025.png
diff --git a/...ract_call_tx_with_7_postconditions/32.png → ...t_call_tx_with_7_postconditions/00026.png b/...ract_call_tx_with_7_postconditions/32.png → ...t_call_tx_with_7_postconditions/00026.png
diff --git a/...ract_call_tx_with_7_postconditions/33.png → ...t_call_tx_with_7_postconditions/00027.png b/...ract_call_tx_with_7_postconditions/33.png → ...t_call_tx_with_7_postconditions/00027.png
diff --git a/...ract_call_tx_with_7_postconditions/28.png → ...t_call_tx_with_7_postconditions/00028.png b/...ract_call_tx_with_7_postconditions/28.png → ...t_call_tx_with_7_postconditions/00028.png
diff --git a/...ract_call_tx_with_7_postconditions/29.png → ...t_call_tx_with_7_postconditions/00029.png b/...ract_call_tx_with_7_postconditions/29.png → ...t_call_tx_with_7_postconditions/00029.png
diff --git a/...ract_call_tx_with_7_postconditions/30.png → ...t_call_tx_with_7_postconditions/00030.png b/...ract_call_tx_with_7_postconditions/30.png → ...t_call_tx_with_7_postconditions/00030.png
diff --git a/...ract_call_tx_with_7_postconditions/31.png → ...t_call_tx_with_7_postconditions/00031.png b/...ract_call_tx_with_7_postconditions/31.png → ...t_call_tx_with_7_postconditions/00031.png
diff --git a/...tract_call_tx_with_7_postconditions/8.png → ...t_call_tx_with_7_postconditions/00032.png b/...tract_call_tx_with_7_postconditions/8.png → ...t_call_tx_with_7_postconditions/00032.png
diff --git a/...tract_call_tx_with_7_postconditions/9.png → ...t_call_tx_with_7_postconditions/00033.png b/...tract_call_tx_with_7_postconditions/9.png → ...t_call_tx_with_7_postconditions/00033.png
diff --git a/...ract_call_tx_with_7_postconditions/34.png → ...t_call_tx_with_7_postconditions/00034.png b/...ract_call_tx_with_7_postconditions/34.png → ...t_call_tx_with_7_postconditions/00034.png
diff --git a/...ract_call_tx_with_7_postconditions/35.png → ...t_call_tx_with_7_postconditions/00035.png b/...ract_call_tx_with_7_postconditions/35.png → ...t_call_tx_with_7_postconditions/00035.png
diff --git a/...ract_call_tx_with_7_postconditions/36.png → ...t_call_tx_with_7_postconditions/00036.png b/...ract_call_tx_with_7_postconditions/36.png → ...t_call_tx_with_7_postconditions/00036.png
diff --git a/...ract_call_tx_with_7_postconditions/37.png → ...t_call_tx_with_7_postconditions/00037.png b/...ract_call_tx_with_7_postconditions/37.png → ...t_call_tx_with_7_postconditions/00037.png
diff --git a/...ts/sign_sponsored_smart_contract_tx/0.png → ...ign_sponsored_smart_contract_tx/00000.png b/...ts/sign_sponsored_smart_contract_tx/0.png → ...ign_sponsored_smart_contract_tx/00000.png
diff --git a/...ts/sign_sponsored_smart_contract_tx/1.png → ...ign_sponsored_smart_contract_tx/00001.png b/...ts/sign_sponsored_smart_contract_tx/1.png → ...ign_sponsored_smart_contract_tx/00001.png
diff --git a/...ts/sign_sponsored_smart_contract_tx/2.png → ...ign_sponsored_smart_contract_tx/00002.png b/...ts/sign_sponsored_smart_contract_tx/2.png → ...ign_sponsored_smart_contract_tx/00002.png
diff --git a/...ts/sign_sponsored_smart_contract_tx/3.png → ...ign_sponsored_smart_contract_tx/00003.png b/...ts/sign_sponsored_smart_contract_tx/3.png → ...ign_sponsored_smart_contract_tx/00003.png
diff --git a/...ts/sign_sponsored_smart_contract_tx/4.png → ...ign_sponsored_smart_contract_tx/00004.png b/...ts/sign_sponsored_smart_contract_tx/4.png → ...ign_sponsored_smart_contract_tx/00004.png
diff --git a/...ts/sign_sponsored_smart_contract_tx/5.png → ...ign_sponsored_smart_contract_tx/00005.png b/...ts/sign_sponsored_smart_contract_tx/5.png → ...ign_sponsored_smart_contract_tx/00005.png
diff --git a/...ts/sign_sponsored_smart_contract_tx/6.png → ...ign_sponsored_smart_contract_tx/00006.png b/...ts/sign_sponsored_smart_contract_tx/6.png → ...ign_sponsored_smart_contract_tx/00006.png
diff --git a/...hots/sign_standard_contract_call_tx/0.png → .../sign_standard_contract_call_tx/00000.png b/...hots/sign_standard_contract_call_tx/0.png → .../sign_standard_contract_call_tx/00000.png
diff --git a/...hots/sign_standard_contract_call_tx/1.png → .../sign_standard_contract_call_tx/00001.png b/...hots/sign_standard_contract_call_tx/1.png → .../sign_standard_contract_call_tx/00001.png
diff --git a/...hots/sign_standard_contract_call_tx/2.png → .../sign_standard_contract_call_tx/00002.png b/...hots/sign_standard_contract_call_tx/2.png → .../sign_standard_contract_call_tx/00002.png
diff --git a/...hots/sign_standard_contract_call_tx/3.png → .../sign_standard_contract_call_tx/00003.png b/...hots/sign_standard_contract_call_tx/3.png → .../sign_standard_contract_call_tx/00003.png
diff --git a/...hots/sign_standard_contract_call_tx/4.png → .../sign_standard_contract_call_tx/00004.png b/...hots/sign_standard_contract_call_tx/4.png → .../sign_standard_contract_call_tx/00004.png
diff --git a/...hots/sign_standard_contract_call_tx/5.png → .../sign_standard_contract_call_tx/00005.png b/...hots/sign_standard_contract_call_tx/5.png → .../sign_standard_contract_call_tx/00005.png
diff --git a/...hots/sign_standard_contract_call_tx/6.png → .../sign_standard_contract_call_tx/00006.png b/...hots/sign_standard_contract_call_tx/6.png → .../sign_standard_contract_call_tx/00006.png
diff --git a/...hots/sign_standard_contract_call_tx/7.png → .../sign_standard_contract_call_tx/00007.png b/...hots/sign_standard_contract_call_tx/7.png → .../sign_standard_contract_call_tx/00007.png
diff --git a/...hots/sign_standard_contract_call_tx/8.png → .../sign_standard_contract_call_tx/00008.png b/...hots/sign_standard_contract_call_tx/8.png → .../sign_standard_contract_call_tx/00008.png
diff --git a/...hots/sign_standard_contract_call_tx/9.png → .../sign_standard_contract_call_tx/00009.png b/...hots/sign_standard_contract_call_tx/9.png → .../sign_standard_contract_call_tx/00009.png
diff --git a/...ots/sign_standard_smart_contract_tx/0.png → ...sign_standard_smart_contract_tx/00000.png b/...ots/sign_standard_smart_contract_tx/0.png → ...sign_standard_smart_contract_tx/00000.png
diff --git a/...ots/sign_standard_smart_contract_tx/1.png → ...sign_standard_smart_contract_tx/00001.png b/...ots/sign_standard_smart_contract_tx/1.png → ...sign_standard_smart_contract_tx/00001.png
diff --git a/...ots/sign_standard_smart_contract_tx/2.png → ...sign_standard_smart_contract_tx/00002.png b/...ots/sign_standard_smart_contract_tx/2.png → ...sign_standard_smart_contract_tx/00002.png
diff --git a/...ots/sign_standard_smart_contract_tx/3.png → ...sign_standard_smart_contract_tx/00003.png b/...ots/sign_standard_smart_contract_tx/3.png → ...sign_standard_smart_contract_tx/00003.png
diff --git a/...ots/sign_standard_smart_contract_tx/4.png → ...sign_standard_smart_contract_tx/00004.png b/...ots/sign_standard_smart_contract_tx/4.png → ...sign_standard_smart_contract_tx/00004.png
diff --git a/...ots/sign_standard_smart_contract_tx/5.png → ...sign_standard_smart_contract_tx/00005.png b/...ots/sign_standard_smart_contract_tx/5.png → ...sign_standard_smart_contract_tx/00005.png
diff --git a/...ots/sign_standard_smart_contract_tx/6.png → ...sign_standard_smart_contract_tx/00006.png b/...ots/sign_standard_smart_contract_tx/6.png → ...sign_standard_smart_contract_tx/00006.png
diff --git a/...x_token_transfer_with_postcondition/0.png → ...ken_transfer_with_postcondition/00000.png b/...x_token_transfer_with_postcondition/0.png → ...ken_transfer_with_postcondition/00000.png
diff --git a/...x_token_transfer_with_postcondition/1.png → ...ken_transfer_with_postcondition/00001.png b/...x_token_transfer_with_postcondition/1.png → ...ken_transfer_with_postcondition/00001.png
diff --git a/...x_token_transfer_with_postcondition/2.png → ...ken_transfer_with_postcondition/00002.png b/...x_token_transfer_with_postcondition/2.png → ...ken_transfer_with_postcondition/00002.png
diff --git a/...x_token_transfer_with_postcondition/3.png → ...ken_transfer_with_postcondition/00003.png b/...x_token_transfer_with_postcondition/3.png → ...ken_transfer_with_postcondition/00003.png
diff --git a/...x_token_transfer_with_postcondition/4.png → ...ken_transfer_with_postcondition/00004.png b/...x_token_transfer_with_postcondition/4.png → ...ken_transfer_with_postcondition/00004.png
diff --git a/...x_token_transfer_with_postcondition/5.png → ...ken_transfer_with_postcondition/00005.png b/...x_token_transfer_with_postcondition/5.png → ...ken_transfer_with_postcondition/00005.png
diff --git a/...x_token_transfer_with_postcondition/6.png → ...ken_transfer_with_postcondition/00006.png b/...x_token_transfer_with_postcondition/6.png → ...ken_transfer_with_postcondition/00006.png
diff --git a/...x_token_transfer_with_postcondition/7.png → ...ken_transfer_with_postcondition/00007.png b/...x_token_transfer_with_postcondition/7.png → ...ken_transfer_with_postcondition/00007.png
diff --git a/...x_token_transfer_with_postcondition/8.png → ...ken_transfer_with_postcondition/00008.png b/...x_token_transfer_with_postcondition/8.png → ...ken_transfer_with_postcondition/00008.png
diff --git a/...x_token_transfer_with_postcondition/9.png → ...ken_transfer_with_postcondition/00009.png b/...x_token_transfer_with_postcondition/9.png → ...ken_transfer_with_postcondition/00009.png
diff --git a/..._token_transfer_with_postcondition/10.png → ...ken_transfer_with_postcondition/00010.png b/..._token_transfer_with_postcondition/10.png → ...ken_transfer_with_postcondition/00010.png
diff --git a/..._token_transfer_with_postcondition/11.png → ...ken_transfer_with_postcondition/00011.png b/..._token_transfer_with_postcondition/11.png → ...ken_transfer_with_postcondition/00011.png
diff --git a/..._token_transfer_with_postcondition/12.png → ...ken_transfer_with_postcondition/00012.png b/..._token_transfer_with_postcondition/12.png → ...ken_transfer_with_postcondition/00012.png
diff --git a/..._token_transfer_with_postcondition/13.png → ...ken_transfer_with_postcondition/00013.png b/..._token_transfer_with_postcondition/13.png → ...ken_transfer_with_postcondition/00013.png
diff --git a/tests_zemu/snapshots/signatureTest/0.png → tests_zemu/snapshots/signatureTest/00000.png b/tests_zemu/snapshots/signatureTest/0.png → tests_zemu/snapshots/signatureTest/00000.png
diff --git a/tests_zemu/snapshots/signatureTest/1.png → tests_zemu/snapshots/signatureTest/00001.png b/tests_zemu/snapshots/signatureTest/1.png → tests_zemu/snapshots/signatureTest/00001.png
diff --git a/tests_zemu/snapshots/signatureTest/2.png → tests_zemu/snapshots/signatureTest/00002.png b/tests_zemu/snapshots/signatureTest/2.png → tests_zemu/snapshots/signatureTest/00002.png
diff --git a/tests_zemu/snapshots/signatureTest/3.png → tests_zemu/snapshots/signatureTest/00003.png b/tests_zemu/snapshots/signatureTest/3.png → tests_zemu/snapshots/signatureTest/00003.png
diff --git a/tests_zemu/snapshots/signatureTest/4.png → tests_zemu/snapshots/signatureTest/00004.png b/tests_zemu/snapshots/signatureTest/4.png → tests_zemu/snapshots/signatureTest/00004.png
diff --git a/tests_zemu/snapshots/signatureTest/5.png → tests_zemu/snapshots/signatureTest/00005.png b/tests_zemu/snapshots/signatureTest/5.png → tests_zemu/snapshots/signatureTest/00005.png
diff --git a/tests_zemu/snapshots/signatureTest/6.png → tests_zemu/snapshots/signatureTest/00006.png b/tests_zemu/snapshots/signatureTest/6.png → tests_zemu/snapshots/signatureTest/00006.png
diff --git a/tests_zemu/snapshots/signatureTest/7.png → tests_zemu/snapshots/signatureTest/00007.png b/tests_zemu/snapshots/signatureTest/7.png → tests_zemu/snapshots/signatureTest/00007.png
diff --git a/tests_zemu/snapshots/signatureTest/8.png → tests_zemu/snapshots/signatureTest/00008.png b/tests_zemu/snapshots/signatureTest/8.png → tests_zemu/snapshots/signatureTest/00008.png
diff --git a/tests_zemu/snapshots/signatureTest/9.png → tests_zemu/snapshots/signatureTest/00009.png b/tests_zemu/snapshots/signatureTest/9.png → tests_zemu/snapshots/signatureTest/00009.png
diff --git a/tests_zemu/tests/test.js b/tests_zemu/tests/test.js
@@ -17,7 +17,7 @@
 import jest, {expect} from "jest";
 import Zemu from "@zondax/zemu";
 import BlockstackApp from "@zondax/ledger-blockstack";
-import { makeSTXTokenTransfer, makeUnsignedSTXTokenTransfer, pubKeyfromPrivKey, publicKeyToString, StacksTestnet } from '@blockstack/stacks-transactions';
+import { broadcastTransaction, makeSTXTokenTransfer, makeUnsignedSTXTokenTransfer, pubKeyfromPrivKey, publicKeyToString, StacksTestnet } from '@blockstack/stacks-transactions';
 import { SpendingCondition  } from '@blockstack/stacks-transactions/lib/authorization';
 const BN = require('bn.js');
 import {ec as EC} from "elliptic";
@@ -172,7 +172,7 @@ describe('Basic checks', function () {
             // Check the signature
             const signatureRequest = app.sign(path, blob);
 
-            // Wait until we are not in the main menu
+            // Wait until we are not in the main men
             await sim.waitUntilScreenIsNot(sim.getMainMenuSnapshot());
 
             await sim.compareSnapshotsAndAccept(".", "signatureTest", 9);
@@ -184,8 +184,18 @@ describe('Basic checks', function () {
             console.log('js_signature ', js_signature);
             console.log('ledger-postSignHash: ', signature.postSignHash.toString('hex'))
             console.log('ledger-compact: ', signature.signatureCompact.toString('hex'))
+            console.log('ledger-vrs', signature.signatureVRS.toString('hex'))
             console.log('ledger-DER: ', signature.signatureDER.toString('hex'))
 
+            unsignedTx.auth.spendingCondition.signature.signature = signature.signatureVRS.toString('hex');
+
+            console.log('unsignedTx serialized ', unsignedTx.serialize().toString('hex'));
+
+            const broadcast = await broadcastTransaction(unsignedTx, network);
+            console.log(broadcast);
+
+            expect(broadcast.reason).not.toBe('SignatureValidation')
+
             expect(signature.returnCode).toEqual(0x9000);
 
             const ec = new EC("secp256k1");

diff --git a/tests_zemu/yarn.lock b/tests_zemu/yarn.lock
@@ -853,7 +853,7 @@
     pirates "^4.0.0"
     source-map-support "^0.5.16"
 
-"@babel/runtime@^7.10.3", "@babel/runtime@^7.10.5", "@babel/runtime@^7.8.4":
+"@babel/runtime@^7.10.3", "@babel/runtime@^7.11.2", "@babel/runtime@^7.8.4":
   version "7.11.2"
   resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.11.2.tgz#f549c13c754cc40b87644b9fa9f09a6a95fe0736"
   integrity sha512-TeWkU52so0mPtDcaCTxNBI/IHiz0pZgr8VEFqXFtZWpYD08ZB6FaSwVAS8MKRQAP3bYKiVjwysOJgMFY28o6Tw==
@@ -927,7 +927,7 @@
     exec-sh "^0.3.2"
     minimist "^1.2.0"
 
-"@grpc/grpc-js@^1.1.3":
+"@grpc/grpc-js@^1.1.5":
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/@grpc/grpc-js/-/grpc-js-1.1.5.tgz#2d0b261cd54a529f6b78ac0de9d6fd91a9a3129c"
   integrity sha512-2huf5z85TdZI4nLmJQ9Zdfd+6vmIyBDs7B4L71bTaHKA9pRsGKAH24XaktMk/xneKJIqAgeIZtg1cyivVZtvrg==
@@ -1239,23 +1239,37 @@
     "@ledgerhq/logs" "^5.22.0"
     rxjs "^6.6.2"
 
+"@ledgerhq/devices@^5.23.0":
+  version "5.23.0"
+  resolved "https://registry.yarnpkg.com/@ledgerhq/devices/-/devices-5.23.0.tgz#e5b800de858e45d247be56708c832c1e51727fe0"
+  integrity sha512-XR9qTwn14WwN8VSMsYD9NTX/TgkmrTnXEh0pIj6HMRZwFzBPzslExOcXuCm3V9ssgAEAxv3VevfV8UulvvZUXA==
+  dependencies:
+    "@ledgerhq/errors" "^5.23.0"
+    "@ledgerhq/logs" "^5.23.0"
+    rxjs "^6.6.3"
+
 "@ledgerhq/errors@^5.22.0":
   version "5.22.0"
   resolved "https://registry.yarnpkg.com/@ledgerhq/errors/-/errors-5.22.0.tgz#7327fc152d4896ddc26aada0943065db21c14880"
   integrity sha512-XDT0meBn39+q+JWzUFXmiFbVYLTy+uHRFMb9napcxyZ0Q/MdKkle9/vkgtvRHjPIkGobklXpyefsgH3BZQHukA==
 
-"@ledgerhq/hw-transport-http@^5.19.1":
-  version "5.22.0"
-  resolved "https://registry.yarnpkg.com/@ledgerhq/hw-transport-http/-/hw-transport-http-5.22.0.tgz#ca4829fcf386c2eb13219c62ed1c1c157585563f"
-  integrity sha512-TOdHuBj60GzPF16SeUIJAVC9bbYR9zIUYqVE1OXnORLiWB6PdzRwetm4A8Mf+k8KFcWHA4YzYfZGmEbxf41VhQ==
+"@ledgerhq/errors@^5.23.0":
+  version "5.23.0"
+  resolved "https://registry.yarnpkg.com/@ledgerhq/errors/-/errors-5.23.0.tgz#30a0338dafba8264556011604abed08bf24979f3"
+  integrity sha512-qtpX8aFrUUlYfOMu7BxTvxqUa8CniE+tEBpVEjYUhVbFdVJjM4ouwJD++RtQkMAU2c5jE7xb12WnUnf5BlAgLQ==
+
+"@ledgerhq/hw-transport-http@^5.23.0":
+  version "5.23.0"
+  resolved "https://registry.yarnpkg.com/@ledgerhq/hw-transport-http/-/hw-transport-http-5.23.0.tgz#9ad58820abef3b3233fe15d9a10ecd3791cf3ef3"
+  integrity sha512-jF9w4d68RasQynSo2CDPH6zVHaRo4Up1x+HyNIk4U8DROgmmkLFTVDRudjB32+9E7N3uIvhbLyVlwCv6zoxp5w==
   dependencies:
-    "@ledgerhq/errors" "^5.22.0"
-    "@ledgerhq/hw-transport" "^5.22.0"
-    "@ledgerhq/logs" "^5.22.0"
+    "@ledgerhq/errors" "^5.23.0"
+    "@ledgerhq/hw-transport" "^5.23.0"
+    "@ledgerhq/logs" "^5.23.0"
     axios "^0.19.0"
     ws "6"
 
-"@ledgerhq/hw-transport@^5.17.0", "@ledgerhq/hw-transport@^5.19.1", "@ledgerhq/hw-transport@^5.22.0":
+"@ledgerhq/hw-transport@^5.17.0":
   version "5.22.0"
   resolved "https://registry.yarnpkg.com/@ledgerhq/hw-transport/-/hw-transport-5.22.0.tgz#d627948b43005ec9e7dfe85adf9aa01e130de280"
   integrity sha512-MFfkVGYMYnr6fI4XGnJQNLd36JIrRpvd5WBmVSDhCO3UKUER2fJ9koVBGc97o7yXtE5IAlJKF+nR9HZJIa0lRQ==
@@ -1264,11 +1278,25 @@
     "@ledgerhq/errors" "^5.22.0"
     events "^3.2.0"
 
+"@ledgerhq/hw-transport@^5.23.0":
+  version "5.23.0"
+  resolved "https://registry.yarnpkg.com/@ledgerhq/hw-transport/-/hw-transport-5.23.0.tgz#ed3445b9579c43a58cd959610ad7e464b36b87ca"
+  integrity sha512-ICTG3Bst62SkC+lYYFgpKk5G4bAOxeIvptXnTLOhf6VqeN7gdHfiRzZwNPnKzI2pxmcEVbBitgsxEIEQJmDKVA==
+  dependencies:
+    "@ledgerhq/devices" "^5.23.0"
+    "@ledgerhq/errors" "^5.23.0"
+    events "^3.2.0"
+
 "@ledgerhq/logs@^5.22.0":
   version "5.22.0"
   resolved "https://registry.yarnpkg.com/@ledgerhq/logs/-/logs-5.22.0.tgz#a54d6b5b391cdb4c2eacc9500feb04b90475c361"
   integrity sha512-jV4mJxD1aieORm+sK9bYakQd9GMLd7KAxgt2IaxhrTU+QD5Ne47mxQOTys9p7f5w25ujs3R+Px2t3KiMRASHtg==
 
+"@ledgerhq/logs@^5.23.0":
+  version "5.23.0"
+  resolved "https://registry.yarnpkg.com/@ledgerhq/logs/-/logs-5.23.0.tgz#7a86b1e6479c8aa8e8b9affe00eb8e369efdbc3b"
+  integrity sha512-88M8RkVHl44k6MAhfrYhx25opnJV24/2XpuTUVklID11f9rBdE+6RZ9OMs39dyX2sDv7TuzIPi5nTRoCqZMDYw==
+
 "@protobufjs/aspromise@^1.1.1", "@protobufjs/aspromise@^1.1.2":
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/@protobufjs/aspromise/-/aspromise-1.1.2.tgz#9b8b0cc663d669a7d8f6f5d0893a14d348f30fbf"
@@ -1548,16 +1576,16 @@
     "@babel/runtime" "^7.10.3"
     "@ledgerhq/hw-transport" "^5.17.0"
 
-"@zondax/zemu@^0.5.1":
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/@zondax/zemu/-/zemu-0.5.1.tgz#4e6d6166d12c746629d84b4dff3d629d57f56719"
-  integrity sha512-VpmCn452InA3txSfMO4FZHoF7w2VoDds/f+A0ApWzJUgiLojdeLZltRn1LHYSQdU7wOb6IX0bqBIp+uMY2wNGw==
+"@zondax/zemu@^0.7.0":
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/@zondax/zemu/-/zemu-0.7.0.tgz#6e88a3fcfb4f7b67cf2212e7ff5aaa2807feeb5e"
+  integrity sha512-Ukglb2E2iW6X292vxF7ZlgfKBoYOv16vptl3CWepho2eXAABQZRmDa2OkD0n20Pd0/VmXHTsDpMKuFPvCwtBIA==
   dependencies:
-    "@babel/runtime" "^7.10.5"
-    "@grpc/grpc-js" "^1.1.3"
+    "@babel/runtime" "^7.11.2"
+    "@grpc/grpc-js" "^1.1.5"
     "@grpc/proto-loader" "^0.5.5"
-    "@ledgerhq/hw-transport" "^5.19.1"
-    "@ledgerhq/hw-transport-http" "^5.19.1"
+    "@ledgerhq/hw-transport" "^5.23.0"
+    "@ledgerhq/hw-transport-http" "^5.23.0"
     dockerode "^3.2.0"
     fs-extra "^9.0.1"
     json-rpc2 "^2.0.0"
@@ -5878,6 +5906,13 @@ rxjs@^6.6.2:
   dependencies:
     tslib "^1.9.0"
 
+rxjs@^6.6.3:
+  version "6.6.3"
+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.3.tgz#8ca84635c4daa900c0d3967a6ee7ac60271ee552"
+  integrity sha512-trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ==
+  dependencies:
+    tslib "^1.9.0"
+
 safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.2, safe-buffer@^5.2.0, safe-buffer@~5.2.0:
   version "5.2.1"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"