BTCPrivate
/
electrum-bitcoinprivate
mirror of https://github.com/BTCPrivate/electrum-bitcoinprivate.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Correct pers string

This commit is contained in:
James 2019-03-01 01:16:27 +01:00
parent 498f914ed0
commit 950f294c5e
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/transaction.py
View File

@ -834,11 +834,11 @@ class Transaction:
nHeader = int_to_hex(0x80000000 | version, 4)
nVersionGroupId = int_to_hex(self.versionGroupId, 4)
s_prevouts = bfh(''.join(self.serialize_outpoint(txin) for txin in inputs))
hashPrevouts = blake2b(s_prevouts, digest_size=32, person=b'ZclassicPrevoutHash').hexdigest()
hashPrevouts = blake2b(s_prevouts, digest_size=32, person=b'ZcashPrevoutHash').hexdigest()
s_sequences = bfh(''.join(int_to_hex(txin.get('sequence', 0xffffffff - 1), 4) for txin in inputs))
hashSequence = blake2b(s_sequences, digest_size=32, person=b'ZclassicSequencHash').hexdigest()
hashSequence = blake2b(s_sequences, digest_size=32, person=b'ZcashSequencHash').hexdigest()
s_outputs = bfh(''.join(self.serialize_output(o) for o in outputs))
hashOutputs = blake2b(s_outputs, digest_size=32, person=b'ZclassicOutputsHash').hexdigest()
hashOutputs = blake2b(s_outputs, digest_size=32, person=b'ZcashOutputsHash').hexdigest()
joinSplits = self.joinSplits
#if joinSplits is None:
# hashJoinSplits = '00'*32
@ -993,7 +993,7 @@ class Transaction:
# add signature
if self.overwintered:
data = bfh(self.serialize_preimage(i))
person = b'ZclassicSigHash' + SAPLING_BRANCH_ID.to_bytes(4, 'little')
person = b'ZcashSigHash' + SAPLING_BRANCH_ID.to_bytes(4, 'little')
pre_hash = blake2b(data, digest_size=32, person=person).digest()
else:
pre_hash = Hash(bfh(self.serialize_preimage(i)))

7
plugins/trezor/clientbase.py
View File

@ -6,6 +6,11 @@ from electrum_zclassic.util import PrintError, UserCancelled
from electrum_zclassic.keystore import bip39_normalize_passphrase
from electrum_zclassic.bitcoin import serialize_xpub
from trezorlib.client import TrezorClient
from trezorlib.exceptions import TrezorFailure, Cancelled, OutdatedFirmwareError
from trezorlib.messages import WordRequestType, FailureType, RecoveryDeviceType
import trezorlib.btc
import trezorlib.device
class GuiMixin(object):
# Requires: self.proto, self.device
@ -173,7 +178,7 @@ class TrezorClientBase(GuiMixin, PrintError):
def get_xpub(self, bip32_path, xtype):
address_n = self.expand_path(bip32_path)
creating = False
node = self.get_public_node(address_n, creating).node
node = trezorlib.btc.get_public_node(address_n, creating).node
return serialize_xpub(xtype, node.chain_code, node.public_key, node.depth, self.i4b(node.fingerprint), self.i4b(node.child_num))
def toggle_passphrase(self):