Support for mainnet/testnet address on any derivation

app/src/apdu_handler.c

@@ -33,6 +33,11 @@ __Z_INLINE void handleGetAddrSecp256K1(volatile uint32_t *flags, volatile uint32
     extractHDPath(rx, OFFSET_DATA);
 
     uint8_t requireConfirmation = G_io_apdu_buffer[OFFSET_P1];
+    uint8_t network = G_io_apdu_buffer[OFFSET_P2];
+
+    // Set the address version
+    if (!set_network_version(network))
+        return THROW(APDU_CODE_DATA_INVALID);
 
     if (requireConfirmation) {
         app_fill_address(addr_secp256k1);

app/src/crypto.c

@@ -48,6 +48,31 @@ typedef struct {
     uint8_t hash_ripe[CX_RIPEMD160_SIZE];
 } __attribute__((packed)) address_temp_t;
 
+
+bool is_valid_network_version(uint8_t version);
+
+// Set the network version to be used when getting the address from
+// the device public key.
+bool set_network_version(uint8_t network) {
+    if (is_valid_network_version(network)) {
+        version = network;
+        return true;
+    }
+    zemu_log_stack("Address version not supported/0");
+    return false;
+}
+
+bool is_valid_network_version(uint8_t version) {
+    switch(version) {
+        case COIN_VERSION_TESTNET_SINGLESIG: break;
+        case COIN_VERSION_MAINNET_SINGLESIG: break;
+        default: {
+            return false;
+        }
+    }
+    return true;
+}
+
 uint16_t crypto_fillAddress_secp256k1(uint8_t *buffer, uint16_t buffer_len) {
     if (buffer_len < sizeof(answer_t)) {
         return 0;
@@ -62,11 +87,9 @@ uint16_t crypto_fillAddress_secp256k1(uint8_t *buffer, uint16_t buffer_len) {
 
     crypto_extractPublicKeyHash(address_temp.hash_ripe, CX_RIPEMD160_SIZE);
 
-    uint8_t version = COIN_VERSION_MAINNET_SINGLESIG;
-    if (isTestnet()) {
-        version = COIN_VERSION_MAINNET_SINGLESIG;
-    }
     size_t outLen = sizeof_field(answer_t, address);
+    if ( !is_valid_network_version(version) )
+        version = COIN_VERSION_MAINNET_SINGLESIG;
     outLen = rs_c32_address(address_temp.hash_ripe, version, answer->address, outLen);
 
     return PK_LEN_SECP256K1 + outLen;

app/src/crypto.h

@@ -32,6 +32,10 @@ extern uint32_t hdPath[HDPATH_LEN_DEFAULT];
 
 extern address_kind_e addressKind;
 
+uint8_t version;
+
+bool set_network_version(uint8_t version);
+
 bool isTestnet();
 
 void crypto_extractPublicKey(const uint32_t path[HDPATH_LEN_DEFAULT], uint8_t *pubKey, uint16_t pubKeyLen);

deps/ledger-zxlib/dockerized_build.mk

@@ -40,12 +40,7 @@ $(info EXAMPLE_VUE_DIR       : $(EXAMPLE_VUE_DIR))
 $(info TESTS_JS_DIR          : $(TESTS_JS_DIR))
 $(info TESTS_JS_PACKAGE      : $(TESTS_JS_PACKAGE))
 
-ifeq ($(USERID),1001)
-# TODO: Use podman inside circleci machines?
-DOCKER_IMAGE=zondax/builder-bolos-1001@sha256:423348672bb9f1e6aca573de29afa6763bcbead1a592cedb62c8fbfd82fb7f65
-else
-DOCKER_IMAGE=zondax/builder-bolos@sha256:2ce8f16b1e3face5464c538198e57a64340f664d932b3383d019f2636321f342
-endif
+DOCKER_IMAGE=zondax/builder-bolos@sha256:0e0097c01ef3c6c964fea8d8b6e3a584f4ff209a04ec68b6b2b4aeab64379c23
 
 ifdef INTERACTIVE
 INTERACTIVE_SETTING:="-i"

js/package.json

@@ -22,7 +22,8 @@
   "dependencies": {
     "@babel/runtime": "^7.12.5",
     "@ledgerhq/hw-transport": "^5.39.1",
-    "@types/ledgerhq__hw-transport": "^4.21.3"
+    "@types/ledgerhq__hw-transport": "^4.21.3",
+    "@stacks/transactions": "^1.0.1"
   },
   "devDependencies": {
     "@babel/cli": "^7.12.10",

js/src/index.ts

@@ -16,7 +16,7 @@
  ******************************************************************************* */
 import Transport from '@ledgerhq/hw-transport';
 import {serializePath} from './helper';
-import {ResponseAddress, ResponseAppInfo, ResponseSign, ResponseVersion} from './types';
+import {ResponseBase, ResponseAddress, ResponseAppInfo, ResponseSign, ResponseVersion} from './types';
 import {
     CHUNK_SIZE,
     CLA,
@@ -30,6 +30,8 @@ import {
     processErrorResponse,
 } from './common';
 
+import type { AddressVersion } from '@stacks/transactions';
+
 export {LedgerError};
 export * from './types';
 
@@ -139,18 +141,17 @@ export default class BlockstackApp {
         }, processErrorResponse);
     }
 
-    async getAddressAndPubKey(path: string): Promise<ResponseAddress> {
+    async getAddressAndPubKey(path: string, version: AddressVersion): Promise<ResponseAddress> {
         const serializedPath = serializePath(path);
         return this.transport
-            .send(CLA, INS.GET_ADDR_SECP256K1, P1_VALUES.ONLY_RETRIEVE, 0, serializedPath, [0x9000])
+            .send(CLA, INS.GET_ADDR_SECP256K1, P1_VALUES.ONLY_RETRIEVE, version, serializedPath, [0x9000])
             .then(processGetAddrResponse, processErrorResponse);
     }
 
-    async showAddressAndPubKey(path: string): Promise<ResponseAddress> {
+    async showAddressAndPubKey(path: string, version: AddressVersion): Promise<ResponseAddress> {
         const serializedPath = serializePath(path);
-
         return this.transport
-            .send(CLA, INS.GET_ADDR_SECP256K1, P1_VALUES.SHOW_ADDRESS_IN_DEVICE, 0, serializedPath, [
+            .send(CLA, INS.GET_ADDR_SECP256K1, P1_VALUES.SHOW_ADDRESS_IN_DEVICE, version, serializedPath, [
                 LedgerError.NoErrors,
             ])
             .then(processGetAddrResponse, processErrorResponse);

rust-toolchain

@@ -1 +1 @@
-1.43.0
+1.49.0

tests_zemu/package.json

@@ -18,7 +18,7 @@
   "dependencies": {
     "@stacks/network": "^1.0.1",
     "@stacks/transactions": "^1.0.1",
-    "@zondax/ledger-blockstack": "^0.1.0",
+    "@zondax/ledger-blockstack": "file:../js",
     "@zondax/zemu": "^0.11.0",
     "bn.js": "^5.1.3"
   },

tests_zemu/tests/test.js

@@ -16,6 +16,7 @@
 
 import jest, { expect } from "jest";
 import Zemu from "@zondax/zemu";
+import NetworkVersion from "@zondax/ledger-blockstack";
 import BlockstackApp from "@zondax/ledger-blockstack";
 import {
   broadcastTransaction,
@@ -24,7 +25,8 @@ import {
   makeSTXTokenTransfer,
   makeUnsignedSTXTokenTransfer,
   pubKeyfromPrivKey,
-  publicKeyToString
+  publicKeyToString,
+  AddressVersion
 } from "@stacks/transactions";
 import { StacksTestnet } from "@stacks/network";
 import { ec as EC } from "elliptic";
@@ -88,7 +90,7 @@ describe("Basic checks", function() {
         await sim.start({ model: nanoModel.model, ...simOptions});
         const app = new BlockstackApp(sim.getTransport());
 
-        const response = await app.getAddressAndPubKey("m/44'/5757'/5'/0/0", true);
+        const response = await app.getAddressAndPubKey("m/44'/5757'/5'/0/0", AddressVersion.MainnetSingleSig, true);
         console.log(response);
         expect(response.returnCode).toEqual(0x9000);
 
@@ -111,11 +113,11 @@ describe("Basic checks", function() {
         // Derivation path. First 3 items are automatically hardened!
         const path = "m/44'/5757'/5'/0/3";
 
-        const respRequest = app.showAddressAndPubKey(path);
+        const respRequest = app.showAddressAndPubKey(path, AddressVersion.MainnetSingleSig);
         // Wait until we are not in the main menu
         await sim.waitUntilScreenIsNot(sim.getMainMenuSnapshot());
 
-        await sim.compareSnapshotsAndAccept(".", `${nanoModel.prefix.toLowerCase()}-show-address`, nanoModel.model === 'nanos' ? 3 : 3);
+        await sim.compareSnapshotsAndAccept(".", `${nanoModel.prefix.toLowerCase()}-show-address`, nanoModel.model === 'nanos' ? 2 : 2);
 
         const resp = await respRequest;
         console.log(resp);
@@ -127,7 +129,13 @@ describe("Basic checks", function() {
         const expected_publicKey = "02beafa347af54948b214106b9972cc4a05a771a2573f32905c48e4dc697171e60";
 
         expect(resp.address).toEqual(expected_address_string);
+        console.log("Response address ", resp.address)
         expect(resp.publicKey.toString("hex")).toEqual(expected_publicKey);
+
+
+        const response_t = await app.getAddressAndPubKey(path, AddressVersion.TestnetSingleSig);
+        const expected_testnet_address_string = "STGZNGF9PTR3ZPJN9J67WRYV5PSV783JY9ZMT3Y6";
+        expect(response_t.address).toEqual(expected_testnet_address_string);
       } finally {
         await sim.close();
       }
@@ -144,7 +152,7 @@ describe("Basic checks", function() {
         const app = new BlockstackApp(sim.getTransport());
 
         // Get pubkey and check
-        const pkResponse = await app.getAddressAndPubKey(path);
+        const pkResponse = await app.getAddressAndPubKey(path, AddressVersion.TestnetSingleSig);
         console.log(pkResponse);
         expect(pkResponse.returnCode).toEqual(0x9000);
         expect(pkResponse.errorMessage).toEqual("No errors");
@@ -196,7 +204,7 @@ describe("Basic checks", function() {
         // Wait until we are not in the main men
         await sim.waitUntilScreenIsNot(sim.getMainMenuSnapshot());
 
-        await sim.compareSnapshotsAndAccept(".", `${nanoModel.prefix.toLowerCase()}-signatureTest`, nanoModel.model === 'nanos' ? 9 : 8);
+        await sim.compareSnapshotsAndAccept(".", `${nanoModel.prefix.toLowerCase()}-signatureTest`, nanoModel.model === 'nanos' ? 8 : 7);
 
         let signature = await signatureRequest;
         console.log(signature);