feat: add parent fingerprint value

Zondax · Jan 20, 2025 · 1a594fb · 1a594fb
1 parent ed98d86
commit 1a594fb
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 10 deletions.
diff --git a/app/src/coin.h b/app/src/coin.h
@@ -48,6 +48,7 @@ extern "C" {
 // data for extended public key
 #define CHAIN_CODE_LEN_SECP256K1 32u
 #define VERSION_LEN 4u
+#define PARENT_FINGERPRINT_LEN 4u
 #define INDEX_LEN 4u
 #define DEPTH_LEN 1u
 

diff --git a/app/src/crypto.c b/app/src/crypto.c
@@ -72,6 +72,7 @@ typedef struct {
 typedef struct {
     uint32_t version;
     uint8_t depth;
+    uint32_t parentFingerprint;
     uint32_t index;
     uint8_t chainCode[CHAIN_CODE_LEN_SECP256K1];
     uint8_t publicKey[PK_LEN_SECP256K1];
@@ -230,6 +231,13 @@ zxerr_t crypto_fillAddress_extended_secp256k1(uint8_t *buffer, uint16_t buffer_l
     );
     io_seproxyhal_io_heartbeat();
 
+    // FIXME this needs to be calculated over the pk calculated for the previous level (parent pk), instead of the current level (current pk)
+    uint8_t sha256_pk[CX_SHA256_SIZE] = {0}; 
+    uint8_t ripe_sha256_pk[CX_RIPEMD160_SIZE] = {0}; 
+    cx_hash_sha256(answer->publicKey, PK_LEN_SECP256K1, sha256_pk, CX_SHA256_SIZE);  // SHA256
+    CHECK_ZXERR(ripemd160(sha256_pk, CX_SHA256_SIZE, ripe_sha256_pk));  // RIPEMD-160
+
+    memcpy(&answer->parentFingerprint, ripe_sha256_pk, PARENT_FINGERPRINT_LEN);
 
     answer->depth = hdPath.len;
     answer->index = hdPath.secp256k1_path[hdPath.len - 1];
@@ -239,7 +247,7 @@ zxerr_t crypto_fillAddress_extended_secp256k1(uint8_t *buffer, uint16_t buffer_l
         answer->version = PK_VERSION_TESTNET;
     }
 
-    *replyLen = PK_LEN_SECP256K1 + CHAIN_CODE_LEN_SECP256K1 + DEPTH_LEN + INDEX_LEN + VERSION_LEN;
+    *replyLen = PK_LEN_SECP256K1 + CHAIN_CODE_LEN_SECP256K1 + DEPTH_LEN + INDEX_LEN + VERSION_LEN + PARENT_FINGERPRINT_LEN;
     return zxerr_ok;
 }
 

diff --git a/js b/js
diff --git a/tests_zemu/tests/addresses.test.ts b/tests_zemu/tests/addresses.test.ts
@@ -51,16 +51,21 @@ describe('Addresses', function () {
       const app = new ZCashApp(sim.getTransport())
       const expectedPk = '0378e0db93ebe9b03fb04f08931038822b75db3a6089f54443b4e8ca1865811b79'
       const expectedChainCode = 'd293abfd48452b107be8a5895c721addca628c0ae36353bac34d13a1d8c5e73e'
-      const expectedExtendedPk = '2JcqaJaGEDfcv3TLvsnVL3tcM47pQ3nN24B7tVGcUEhPqaawqCrCtvvwWcgT7ExDmK2eGDtoikKsrqkwXpVjw77c4SaJyxBqrJm3W'
+      const expectedIndex = 0x80000000 + 5
+      const expectedDepth = 3
+      const expectedVersion = 0x0488B21E
+      const expectedFingerprint = "f4abeb80"
+      const expectedExtendedPk = '9XpNiCCC7BPCmQdqhAWdTVZJpNsDQUfxnnXDYpnqFgtyPxB4mBsMjp12a1s4SUM9qjSc9jn1W5btMvGPQYgPHBasdp2jJYdQkS3K8xQx4g'
 
       const addr = await app.getAddressTransparentExtended(`m/44'/133'/5'`, false)
       console.log(addr)
 
-      expect(addr?.version).toEqual(0x0488B21E)
+      expect(addr?.version).toEqual(expectedVersion)
+      expect(addr?.parentFingerprint.toString("hex")).toEqual(expectedFingerprint)
       expect(addr?.chainCode.toString('hex')).toEqual(expectedChainCode)
       expect(addr?.publicKey.toString('hex')).toEqual(expectedPk)
-      expect(addr?.index).toEqual(0x80000000 + 5)
-      expect(addr?.depth).toEqual(3)
+      expect(addr?.index).toEqual(expectedIndex)
+      expect(addr?.depth).toEqual(expectedDepth)
       expect(addr?.extendedPk).toEqual(expectedExtendedPk)
     } finally {
       await sim.close()
@@ -105,19 +110,24 @@ describe('Addresses', function () {
       const app = new ZCashApp(sim.getTransport())
       const expectedPk = '0378e0db93ebe9b03fb04f08931038822b75db3a6089f54443b4e8ca1865811b79'
       const expectedChainCode = 'd293abfd48452b107be8a5895c721addca628c0ae36353bac34d13a1d8c5e73e'
-      const expectedExtendedPk = '2JcqaJaGEDfcv3TLvsnVL3tcM47pQ3nN24B7tVGcUEhPqaawqCrCtvvwWcgT7ExDmK2eGDtoikKsrqkwXpVjw77c4SaJyxBqrJm3W'
+      const expectedIndex = 0x80000000 + 5
+      const expectedDepth = 3
+      const expectedVersion = 0x0488B21E
+      const expectedFingerprint = "f4abeb80"
+      const expectedExtendedPk = '9XpNiCCC7BPCmQdqhAWdTVZJpNsDQUfxnnXDYpnqFgtyPxB4mBsMjp12a1s4SUM9qjSc9jn1W5btMvGPQYgPHBasdp2jJYdQkS3K8xQx4g'
 
       const addrReq = app.getAddressTransparentExtended(`m/44'/133'/5'`, true)
       await sim.waitUntilScreenIsNot(sim.getMainMenuSnapshot())
       await sim.compareSnapshotsAndApprove('.', `${m.prefix.toLowerCase()}-show_address_unshielded_extended`)
 
       const addr = await addrReq
 
-      expect(addr?.version).toEqual(0x0488B21E)
+      expect(addr?.version).toEqual(expectedVersion)
+      expect(addr?.parentFingerprint.toString("hex")).toEqual(expectedFingerprint)
       expect(addr?.chainCode.toString('hex')).toEqual(expectedChainCode)
       expect(addr?.publicKey.toString('hex')).toEqual(expectedPk)
-      expect(addr?.index).toEqual(0x80000000 + 5)
-      expect(addr?.depth).toEqual(3)
+      expect(addr?.index).toEqual(expectedIndex)
+      expect(addr?.depth).toEqual(expectedDepth)
       expect(addr?.extendedPk).toEqual(expectedExtendedPk)
     } finally {
       await sim.close()