AaronFiore/electrum
1
0
Fork 0
Code Activity

fixes for make_commitment, but still incorrect destination address (csv arg?)

Browse Source
This commit is contained in:
SomberNight
2018-04-13 18:47:47 +02:00
committed by ThomasV
parent eca8d13e37
commit aaa67adb5a
2 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lib/tests/test_lnbase.py
View File

@@ -39,11 +39,11 @@ class Test_LNBase(unittest.TestCase):
# local_signature = 3044022051b75c73198c6deee1a875871c3961832909acd297c6b908d59e3319e5185a46022055c419379c5051a78d00dbbce11b5b664a0c22815fbcc6fcef6b1937c3836939
#num_htlcs: 0
our_commit_tx = make_commitment(
local_funding_pubkey, remote_funding_pubkey,
local_funding_pubkey, remote_funding_pubkey, remotepubkey,
local_payment_basepoint, remote_payment_basepoint,
local_revocation_pubkey, local_delayedpubkey,
funding_tx_id, funding_output_index, funding_amount_satoshi,
to_local_msat, to_remote_msat, local_feerate_per_kw)
to_local_msat, to_remote_msat, local_feerate_per_kw, local_delay)
our_commit_tx.sign({bh2u(local_funding_pubkey): (local_funding_privkey[:-1], True)})
ref_commit_tx_str = '02000000000101bef67e4e2fb9ddeeb3461973cd4c62abb35050b1add772995b820b584a488489000000000038b02b8002c0c62d0000000000160014ccf1af2f2aabee14bb40fa3851ab2301de84311054a56a00000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e0400473044022051b75c73198c6deee1a875871c3961832909acd297c6b908d59e3319e5185a46022055c419379c5051a78d00dbbce11b5b664a0c22815fbcc6fcef6b1937c383693901483045022100f51d2e566a70ba740fc5d8c0f07b9b93d2ed741c3c0860c613173de7d39e7968022041376d520e9c0e1ad52248ddf4b22e12be8763007df977253ef45a4ca3bdb7c001475221023da092f6980e58d2c037173180e9a465476026ee50f96695963e8efe436f54eb21030e9f7b623d2ccc7c9bd44d66d5ce21ce504c0acf6385a132cec6d3c39fa711c152ae3e195220'
ref_commit_tx = Transaction(ref_commit_tx_str)
@@ -51,9 +51,14 @@ class Test_LNBase(unittest.TestCase):
pubkeys, _x_pubkeys = our_commit_tx.get_sorted_pubkeys(our_commit_tx.inputs()[0])
index_of_pubkey = pubkeys.index(bh2u(remote_funding_pubkey))
our_commit_tx._inputs[0]["signatures"][index_of_pubkey] = remote_signature + "01"
print("our tx", str(our_commit_tx))
print("Reference inputs", json.dumps(ref_commit_tx.inputs(), indent=2))
print("Our inputs", json.dumps(our_commit_tx.inputs(), indent=2))
#print("Reference inputs", json.dumps(ref_commit_tx.inputs(), indent=2))
#print("Our inputs", json.dumps(our_commit_tx.inputs(), indent=2))
print("Reference outputs", ref_commit_tx.outputs())
print("Our outputs", our_commit_tx.outputs())
#print("Reference tx", ref_commit_tx)
#print("Our tx", our_commit_tx)
for idx, inp in enumerate(our_commit_tx.inputs()):
for field in inp.keys():