AaronFiore/electrum
1
0
Fork 0
Code Activity

fix derive_secret

Browse Source
This commit is contained in:
Janus
2018-04-19 19:36:10 +02:00
committed by ThomasV
parent 576a74a48a
commit b523085fa3
2 changed files with 13 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
lib/lnbase.py
View File

@@ -317,31 +317,16 @@ def derive_blinded_pubkey(basepoint, per_commitment_point):
return point_to_ser(k1 + k2)
def get_per_commitment_secret_from_seed(seed: int, i: int) -> int:
def get_per_commitment_secret_from_seed(seed: int, bits: int, i: int) -> int:
"""Generate per commitment secret."""
#seed ^= 1
#pcs_bytes = seed.to_bytes(byteorder="big", length=32)
#print(bh2u(pcs_bytes))
#return int.from_bytes(hashlib.sha256(pcs_bytes[::-1]).digest(), byteorder="big")
#tmp = seed.to_bytes(byteorder="big", length=32)
#seed = int.from_bytes(tmp[::-1], byteorder="big")
per_commitment_secret = seed
print('get_per_commitment_secret_from_seed() per_commitment_secret', per_commitment_secret)
print('get_per_commitment_secret_from_seed() i', i)
for bitindex in range(47, -1, -1): # 47, 46, ..., 0
for bitindex in range(bits, -1, -1): # 47, 46, ..., 0
mask = 1 << bitindex
if i & mask:
print('get_per_commitment_secret_from_seed() bitindex, mask', bitindex, mask)
print('get_per_commitment_secret_from_seed() branch entered')
per_commitment_secret ^= mask
print('get_per_commitment_secret_from_seed() per_commitment_secret br1', per_commitment_secret)
pcs_bytes = per_commitment_secret.to_bytes(byteorder="big", length=32)
per_commitment_secret = int.from_bytes(bitcoin.sha256(pcs_bytes[::-1]), byteorder="big")
print('get_per_commitment_secret_from_seed() per_commitment_secret br2', per_commitment_secret)
pcs_bytes = bytearray(per_commitment_secret.to_bytes(byteorder="big", length=32))
pcs_bytes[bitindex // 8] ^= 1 << (bitindex % 8)
per_commitment_secret = int.from_bytes(bitcoin.sha256(pcs_bytes), byteorder="big")
return per_commitment_secret