lnbase: verification of new local commitment working

lib/lnbase.py

@@ -886,8 +886,8 @@ class Peer(PrintError):
             local_next_per_commitment_secret,
             byteorder="big"))
 
-        remote_revocation_pubkey = derive_blinded_pubkey(remote_revocation_basepoint, remote_next_commitment_point)
-        remote_htlc_pubkey = derive_pubkey(remote_htlc_basepoint, remote_next_commitment_point)
+        remote_revocation_pubkey = derive_blinded_pubkey(remote_revocation_basepoint, local_next_per_commitment_point)
+        remote_htlc_pubkey = derive_pubkey(remote_htlc_basepoint, local_next_per_commitment_point)
         local_htlc_pubkey = derive_pubkey(local_htlc_basepoint, local_next_per_commitment_point)
         payment_hash = self.unfulfilled_htlcs[0]["payment_hash"]
         cltv_expiry = int.from_bytes(self.unfulfilled_htlcs[0]["cltv_expiry"],"big")
@@ -896,10 +896,9 @@ class Peer(PrintError):
         local_ctx_args = local_ctx_args._replace(remote_amount = local_ctx_args.remote_amount - expected_received_sat)
         local_ctx_args = local_ctx_args._replace(ctn = local_next_commitment_number)
         local_ctx_args = local_ctx_args._replace(remote_revocation_pubkey = remote_revocation_pubkey)
-        local_ctx_args = local_ctx_args._replace(remotepubkey = derive_pubkey(local_ctx_args.remote_payment_basepoint, remote_next_commitment_point))
+        local_ctx_args = local_ctx_args._replace(remotepubkey = derive_pubkey(local_ctx_args.remote_payment_basepoint, local_next_per_commitment_point))
         local_ctx_args = local_ctx_args._replace(local_delayedpubkey = derive_pubkey(delayed_payment_basepoint, local_next_per_commitment_point))
 
-        # make_received_htlc(revocation_pubkey, remote_htlcpubkey, local_htlcpubkey, payment_hash, cltv_expiry)
         htlcs = [
             (
                 make_received_htlc(remote_revocation_pubkey, remote_htlc_pubkey, local_htlc_pubkey, payment_hash, cltv_expiry),
@@ -909,10 +908,6 @@ class Peer(PrintError):
 
         new_commitment = make_commitment(*local_ctx_args, htlcs=htlcs)
         preimage_hex = new_commitment.serialize_preimage(0)
-        print("new commitment tx", new_commitment)
-        print("new commitment tx outputs", new_commitment.outputs())
-        for idx, output in enumerate(new_commitment.outputs()):
-            print("output {}: ".format(idx), bitcoin.address_to_script(output[1] ))
         pre_hash = bitcoin.Hash(bfh(preimage_hex))
         if not bitcoin.verify_signature(remote_funding_pubkey, commitment_signed_msg["signature"], pre_hash):
             raise Exception('failed verifying signature of updated commitment transaction')

lib/tests/test_lnbase.py

@@ -3,6 +3,7 @@ import json
 import unittest
 
 from lib.util import bh2u, bfh
+from lib.lnbase import FOR_US, FOR_REMOTE
 from lib.lnbase import make_commitment, get_obscured_ctn, Peer, make_offered_htlc, make_received_htlc, make_htlc_tx
 from lib.lnbase import secret_to_pubkey, derive_pubkey, derive_privkey, derive_blinded_pubkey, overall_weight
 from lib.lnbase import make_htlc_tx_output, make_htlc_tx_inputs, get_per_commitment_secret_from_seed
@@ -69,7 +70,7 @@ class Test_LNBase(unittest.TestCase):
             local_payment_basepoint, remote_payment_basepoint,
             local_revocation_pubkey, local_delayedpubkey, local_delay,
             funding_tx_id, funding_output_index, funding_amount_satoshi,
-            local_amount, remote_amount, local_dust_limit_satoshi, local_fee_rate=local_feerate_per_kw, htlcs=[])
+            local_amount, remote_amount, local_dust_limit_satoshi, local_feerate=local_feerate_per_kw, commitment_owner=FOR_US, htlcs=[])
         self.sign_and_insert_remote_sig(our_commit_tx, remote_funding_pubkey, remote_signature, local_funding_pubkey, local_funding_privkey)
         ref_commit_tx_str = '02000000000101bef67e4e2fb9ddeeb3461973cd4c62abb35050b1add772995b820b584a488489000000000038b02b8002c0c62d0000000000160014ccf1af2f2aabee14bb40fa3851ab2301de84311054a56a00000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e0400473044022051b75c73198c6deee1a875871c3961832909acd297c6b908d59e3319e5185a46022055c419379c5051a78d00dbbce11b5b664a0c22815fbcc6fcef6b1937c383693901483045022100f51d2e566a70ba740fc5d8c0f07b9b93d2ed741c3c0860c613173de7d39e7968022041376d520e9c0e1ad52248ddf4b22e12be8763007df977253ef45a4ca3bdb7c001475221023da092f6980e58d2c037173180e9a465476026ee50f96695963e8efe436f54eb21030e9f7b623d2ccc7c9bd44d66d5ce21ce504c0acf6385a132cec6d3c39fa711c152ae3e195220'
         self.assertEqual(str(our_commit_tx), ref_commit_tx_str)
@@ -158,7 +159,7 @@ class Test_LNBase(unittest.TestCase):
             local_revocation_pubkey, local_delayedpubkey, local_delay,
             funding_tx_id, funding_output_index, funding_amount_satoshi,
             local_amount, remote_amount, local_dust_limit_satoshi,
-            htlcs=htlcs, local_fee_rate=local_feerate_per_kw)
+            local_feerate=local_feerate_per_kw, commitment_owner=FOR_US, htlcs=htlcs)
         self.sign_and_insert_remote_sig(our_commit_tx, remote_funding_pubkey, remote_signature, local_funding_pubkey, local_funding_privkey)
         self.assertEqual(str(our_commit_tx), output_commit_tx)