Correct pers string
This commit is contained in:
parent
498f914ed0
commit
950f294c5e
|
@ -834,11 +834,11 @@ class Transaction:
|
||||||
nHeader = int_to_hex(0x80000000 | version, 4)
|
nHeader = int_to_hex(0x80000000 | version, 4)
|
||||||
nVersionGroupId = int_to_hex(self.versionGroupId, 4)
|
nVersionGroupId = int_to_hex(self.versionGroupId, 4)
|
||||||
s_prevouts = bfh(''.join(self.serialize_outpoint(txin) for txin in inputs))
|
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))
|
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))
|
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
|
joinSplits = self.joinSplits
|
||||||
#if joinSplits is None:
|
#if joinSplits is None:
|
||||||
# hashJoinSplits = '00'*32
|
# hashJoinSplits = '00'*32
|
||||||
|
@ -993,7 +993,7 @@ class Transaction:
|
||||||
# add signature
|
# add signature
|
||||||
if self.overwintered:
|
if self.overwintered:
|
||||||
data = bfh(self.serialize_preimage(i))
|
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()
|
pre_hash = blake2b(data, digest_size=32, person=person).digest()
|
||||||
else:
|
else:
|
||||||
pre_hash = Hash(bfh(self.serialize_preimage(i)))
|
pre_hash = Hash(bfh(self.serialize_preimage(i)))
|
||||||
|
|
|
@ -6,6 +6,11 @@ from electrum_zclassic.util import PrintError, UserCancelled
|
||||||
from electrum_zclassic.keystore import bip39_normalize_passphrase
|
from electrum_zclassic.keystore import bip39_normalize_passphrase
|
||||||
from electrum_zclassic.bitcoin import serialize_xpub
|
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):
|
class GuiMixin(object):
|
||||||
# Requires: self.proto, self.device
|
# Requires: self.proto, self.device
|
||||||
|
@ -173,7 +178,7 @@ class TrezorClientBase(GuiMixin, PrintError):
|
||||||
def get_xpub(self, bip32_path, xtype):
|
def get_xpub(self, bip32_path, xtype):
|
||||||
address_n = self.expand_path(bip32_path)
|
address_n = self.expand_path(bip32_path)
|
||||||
creating = False
|
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))
|
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):
|
def toggle_passphrase(self):
|
||||||
|
|
Loading…
Reference in New Issue