Merge pull request #20 from instagibbs/keepdetails

take version and sequence numbers in help functions

Author: btchip

btchip/btchip.py

@@ -195,7 +195,7 @@ def getTrustedInput(self, transaction, index):
 		result['value'] = response
 		return result
 
-	def startUntrustedTransaction(self, newTransaction, inputIndex, outputList, redeemScript):
+	def startUntrustedTransaction(self, newTransaction, inputIndex, outputList, redeemScript, version=0x01):
 		# Start building a fake transaction with the passed inputs
 		segwit = False
 		if newTransaction:
@@ -211,7 +211,7 @@ def startUntrustedTransaction(self, newTransaction, inputIndex, outputList, rede
 		else:
 				p2 = 0x80
 		apdu = [ self.BTCHIP_CLA, self.BTCHIP_INS_HASH_INPUT_START, 0x00, p2 ]
-		params = bytearray([0x01, 0x00, 0x00, 0x00]) # default version
+		params = bytearray([version, 0x00, 0x00, 0x00])
 		writeVarint(len(outputList), params)
 		apdu.append(len(params))
 		apdu.extend(params)

btchip/btchipUtils.py

@@ -43,7 +43,10 @@ def format_transaction(dongleOutputData, trustedInputsAndInputScripts, version=0
 		newInput = bitcoinInput()
 		newInput.prevOut = item[0][4:4+36]
 		newInput.script = item[1]
-		newInput.sequence = bytearray([0xff, 0xff, 0xff, 0xff])
+                if len(item > 2):
+			newInput.sequence = bytearray(item[2].decode('hex'))
+		else:
+			newInput.sequence = bytearray([0xff, 0xff, 0xff, 0xff])
 		transaction.inputs.append(newInput)
 	result = transaction.serialize(True)
 	result.extend(dongleOutputData)