Merge pull request #17 from keepkey/device-protocol-4.0.0

Update client build with device-protocol v4.0.0

Author: bgok

.gitignore

@@ -1,4 +1,5 @@
 build/
+device-protocol/
 dist/
 python_trezor.egg-info/
 trezor.egg-info/

build_pb.sh

@@ -1,19 +1,21 @@
 #!/bin/bash
 CURDIR=$(pwd)
-
 DEVICE_PROTO="device-protocol"
 
-if [ ! -d ../$DEVICE_PROTO ]
+# Create a clean directory for the protobuf files
+if [ -d $DEVICE_PROTO ]
 then
-    git clone https://github.com/keepkey/$DEVICE_PROTO.git ../$DEVICE_PROTO
-    sed -Ee 's/^import ([^.]+_pb2)/from . import \1/' -i "" $CURDIR/keepkeylib/"$i"_pb2.py
+    rm -rf $DEVICE_PROTO
 fi
 
-cd $CURDIR/../$DEVICE_PROTO
+git clone --branch v4.0.0 --depth 1 https://github.com/keepkey/$DEVICE_PROTO.git $DEVICE_PROTO
+cd $DEVICE_PROTO
 
+echo "Building with protoc version: $(protoc --version)"
 for i in messages types exchange ; do
     protoc --python_out=$CURDIR/keepkeylib/ -I/usr/include -I. $i.proto
+    sed -Ee 's/^import ([^.]+_pb2)/from . import \1/' -i "" $CURDIR/keepkeylib/"$i"_pb2.py
 done
 
 cd $CURDIR/keepkeylib
-sed -i -- 's/5000\([2-5]\)/6000\1/g' types_pb2.py
+sed -i "" 's/5000\([2-5]\)/6000\1/g' types_pb2.py

docker_build_pb.sh

@@ -1,10 +1,9 @@
 #!/bin/bash
 
-TEMPDIR="../device-protocol"
 IMAGETAG=keepkey/firmware
 
-docker build -t $IMAGETAG .
-
-docker run -t -v $(pwd):/root/python-keepkey -v $(pwd)/$TEMPDIR:/root/device-protocol --rm $IMAGETAG /bin/sh -c "\
-	cd /root/python-keepkey && \
-	./build_pb.sh"
+docker run -it --rm \
+    -v $(pwd):/root/python-keepkey \
+    -w /root/python-keepkey \
+    $IMAGETAG \
+    ./build_pb.sh

keepkeylib/client.py

@@ -506,7 +506,18 @@ def expand_path(n):
             n = n[1:]
 
         # coin_name/a/b/c => 44'/SLIP44_constant'/a/b/c
-        coins = { "Bitcoin": 0, "Testnet": 1, "Namecoin": 7, "Litecoin": 2, "Dogecoin": 3, "Dash": 5, "Zcash": 133, }
+        # https://github.com/satoshilabs/slips/blob/master/slip-0044.md
+        coins = {
+            "Bitcoin": 0,
+            "Testnet": 1,
+            "Litecoin": 2,
+            "Dogecoin": 3,
+            "Dash": 5,
+            "Namecoin": 7,
+            "Zcash": 133,
+            "BitcoinCash": 145,
+        }
+
         if n[0] in coins:
             n = ["44'", "%d'" % coins[n[0]] ] + n[1:]