Merge pull request keepkey#167 from keepkey/btc-only

Btc only

Author: pastaghost

.circleci/config.yml

@@ -1,42 +1,74 @@
-version: 2
+version: 2          # keep 2.0 syntax; CircleCI 2.1 also works
+
 jobs:
   emulator-build-test:
     docker:
-      - image: circleci/python:3.7
+      - image: circleci/python:3.7      # upgrade to cimg/python:3.12 if you like
     steps:
-      - checkout:
-          path: .pykk
+      # ────────────────────────────────────────────────────────────────
+      # 1) Pull python-keepkey via HTTPS so no SSH key is required
+      # ────────────────────────────────────────────────────────────────
+      - run:
+          name: Clone python-keepkey
+          command: git clone --depth 1 https://github.com/keepkey/python-keepkey.git .pykk
+
+      # ────────────────────────────────────────────────────────────────
+      # 2) Grab firmware repo and inject our fresh python-keepkey copy
+      # ────────────────────────────────────────────────────────────────
       - run:
-          name: Checkout Firmware & Inject python-keepkey
+          name: Checkout firmware & inject python-keepkey
           command: |
+            # Ensure all submodule URLs fall back to HTTPS
             git config --global url."https://github.com/".insteadOf git@github.com:
             git config --global url."https://".insteadOf git://
+
+            # Move python-keepkey out of the way for the moment
             mv .pykk ../
-            git clone $FIRMWARE_REPO --depth 1 -b master .
+
+            # Clone firmware repository (expects $FIRMWARE_REPO env var)
+            git clone --depth 1 -b master "$FIRMWARE_REPO" .
+
+            # Initialise firmware submodules
             git submodule update --init --recursive
+
+            # Replace the vendor copy with our freshly–cloned python-keepkey
             rm -rf deps/python-keepkey
             mv ../.pykk deps/python-keepkey
+
+            # Pull python-keepkey submodules too
             cd deps/python-keepkey
             git submodule update --init --recursive
+            cd ../../..
+
+      # ────────────────────────────────────────────────────────────────
+      # 3) Build the Docker-based emulator tests
+      # ────────────────────────────────────────────────────────────────
       - setup_remote_docker
+
       - run:
-          name: Emulator Tests
+          name: Emulator tests
           command: |
             pushd ./scripts/emulator
-            set +e
+            set +e                                   # don’t exit on first failure
             docker-compose up --build firmware-unit
             docker-compose up --build python-keepkey
             set -e
+
+            # Collect JUnit / pytest XML results
             mkdir -p ../../test-reports
             docker cp "$(docker-compose ps -q firmware-unit)":/kkemu/test-reports/. ../../test-reports/
             docker cp "$(docker-compose ps -q python-keepkey)":/kkemu/test-reports/. ../../test-reports/
             popd
-            [ "$(cat test-reports/python-keepkey/status)$(cat test-reports/firmware-unit/status)" == "00" ] || exit 1
+
+            # Fail job if either container reported non-zero status
+            [ "$(cat test-reports/python-keepkey/status)$(cat test-reports/firmware-unit/status)" = "00" ] || exit 1
+
       - store_test_results:
           path: test-reports
+
+# ──────────────────────────────────────────────────────────────────────
 workflows:
   version: 2
   emulator:
     jobs:
       - emulator-build-test
-

build_pb.sh

@@ -3,7 +3,7 @@ CURDIR=$(pwd)
 cd "device-protocol"
 
 echo "Building with protoc version: $(protoc --version)"
-for i in messages messages-ethereum messages-eos messages-nano messages-cosmos messages-ripple messages-binance messages-tendermint messages-thorchain messages-osmosis types ; do
+for i in messages messages-ethereum messages-eos messages-nano messages-cosmos messages-ripple messages-binance messages-tendermint messages-thorchain messages-osmosis messages-mayachain types ; do
     protoc --python_out=$CURDIR/keepkeylib/ -I/usr/include -I. $i.proto
     i=${i/-/_}
     sed -i -Ee 's/^import ([^.]+_pb2)/from . import \1/' $CURDIR/keepkeylib/"$i"_pb2.py

keepkeylib/client.py

@@ -44,6 +44,7 @@
 from . import messages_ripple_pb2 as ripple_proto
 from . import messages_tendermint_pb2 as tendermint_proto
 from . import messages_thorchain_pb2 as thorchain_proto
+from . import messages_mayachain_pb2 as mayachain_proto
 from . import types_pb2 as types
 from . import eos
 from . import nano
@@ -362,6 +363,7 @@ def __init__(self, *args, **kwargs):
         # Always press Yes and provide correct pin
         self.setup_debuglink(True, True)
         self.auto_button = True
+        # self.auto_button = False
 
         # Do not expect any specific response from device
         self.expected_responses = None
@@ -1189,6 +1191,7 @@ def _prepare_sign_tx(self, coin_name, inputs, outputs):
             if not self.tx_api:
                 raise Exception('TX_API not defined')
 
+
             prev_tx = self.tx_api.get_tx(binascii.hexlify(inp.prev_hash).decode('utf-8'))
             txes[inp.prev_hash] = prev_tx
 
@@ -1199,7 +1202,6 @@ def sign_tx(self, coin_name, inputs, outputs, version=None, lock_time=None, debu
 
         start = time.time()
         txes = self._prepare_sign_tx(coin_name, inputs, outputs)
-
         # Prepare and send initial message
         tx = proto.SignTx()
         tx.inputs_count = len(inputs)

keepkeylib/mapping.py

@@ -8,6 +8,7 @@
 from . import messages_binance_pb2 as binance_proto
 from . import messages_tendermint_pb2 as tendermint_proto
 from . import messages_thorchain_pb2 as thorchain_proto
+from . import messages_mayachain_pb2 as mayachain_proto
 
 map_type_to_class = {}
 map_class_to_type = {}
@@ -33,6 +34,8 @@ def build_map():
             msg_class = getattr(tendermint_proto, msg_name)
         elif msg_type.startswith('MessageType_Thorchain'):
             msg_class = getattr(thorchain_proto, msg_name)
+        elif msg_type.startswith('MessageType_Mayachain'):
+            msg_class = getattr(mayachain_proto, msg_name)
         else:
             msg_class = getattr(proto, msg_name)