Merge pull request #59 from niftynei/nifty/ripemd160-fallback

openssl: add fallback for ripemd160 implementation

.github/workflows/build.yml

@@ -31,7 +31,7 @@ jobs:
           black . --check --diff
       - name: flake8 check
         run: |
-          flake8 --ignore=E501,E731,W503
+          make check-flake8
       - name: Test with pytest
         run: |
           pytest tests

Makefile

@@ -1,6 +1,6 @@
 #! /usr/bin/make
 
-PYTHONFILES := $(shell find * -name '*.py')
+PYTHONFILES := $(shell find * ! -path "build/*" ! -path "venv/*" -name '*.py')
 POSSIBLE_PYTEST_NAMES=pytest-3 pytest3 pytest
 PYTEST := $(shell for p in $(POSSIBLE_PYTEST_NAMES); do if type $$p > /dev/null; then echo $$p; break; fi done)
 TEST_DIR=tests
@@ -16,7 +16,7 @@ check: check-pytest-found
 check-source: check-fmt check-flake8 check-mypy check-internal-tests
 
 check-flake8:
-	flake8 --ignore=E501,E731,W503
+	flake8 --ignore=E501,E731,W503 --exclude=venv\/,build\/
 
 check-mypy:
 	mypy --ignore-missing-imports --disallow-untyped-defs --disallow-incomplete-defs $(PYTHONFILES)

docker/Dockerfile.clightning

@@ -1,10 +1,10 @@
-FROM ubuntu:20.04
+FROM ubuntu:22.04
 LABEL mantainer="Vincenzo Palazzo vincenzopalazzodev@gmail.com"
 
 WORKDIR /work
 
 ENV BITCOIN_VERSION=23.0
-ENV CLIGHTNING_VERSION=0.11.0
+ENV CLIGHTNING_VERSION=0.12.0
 ENV DEBIAN_FRONTEND=noninteractive
 
 RUN apt-get -qq update && \
@@ -59,10 +59,8 @@ RUN pip3 install -U pip && \
 RUN git config --global user.name "John Doe" && \
 	git config --global user.email johndoe@example.com && \
 	git clone https://github.com/ElementsProject/lightning.git && \
-    cd lightning && \
-    # git checkout v$CLIGHTNING_VERSION && \
-	# fetch core lightning patch
-	git pull origin pull/5367/head && \
+        cd lightning && \
+        git checkout v$CLIGHTNING_VERSION && \
     poetry config virtualenvs.create false && \
     poetry install && \
     ./configure --enable-developer && \

docker/entrypoint.sh

@@ -1,6 +1,6 @@
 #! /bin/bash
 cd lnprototest || exit
-for i in range{0..20};
+for i in range{0..14};
 do
   if make check PYTEST_ARGS='--runner=lnprototest.clightning.Runner -n4 --dist=loadfile --log-cli-level=DEBUG'; then
     echo "iteration $i succeeded"

lnprototest/backend/bitcoind.py

@@ -40,12 +40,7 @@ def f(*args: Any) -> Callable:
                 "Calling {name} with arguments {args}".format(name=name, args=args)
             )
             res = self.__proxy._call(name, *args)
-            logging.debug(
-                "Result for {name} call: {res}".format(
-                    name=name,
-                    res=res,
-                )
-            )
+            logging.debug("Result for {name} call: {res}".format(name=name, res=res))
             return res
 
         # Make debuggers show <function bitcoin.rpc.name> rather than <function

lnprototest/clightning/clightning.py

@@ -155,6 +155,7 @@ def start(self, also_bitcoind: bool = True) -> None:
                 "--bitcoin-rpcport={}".format(self.bitcoind.port),
                 "--log-level=debug",
                 "--log-file=log",
+                "--htlc-maximum-msat=2000sat",
             ]
             + self.startup_flags
         )

lnprototest/commit_tx.py

@@ -9,10 +9,10 @@
     CTxWitness,
     CScriptWitness,
 )
+from bitcoin.core.contrib.ripemd160 import ripemd160
 import bitcoin.core.script as script
 from bitcoin.core.script import CScript
 import struct
-import hashlib
 from hashlib import sha256
 from .keyset import KeySet
 from .errors import SpecFileError, EventError
@@ -111,9 +111,7 @@ def __init__(
 
     @staticmethod
     def ripemd160(b: bytes) -> bytes:
-        hasher = hashlib.new("ripemd160")
-        hasher.update(b)
-        return hasher.digest()
+        return ripemd160(b)
 
     def revocation_privkey(self, side: Side) -> coincurve.PrivateKey:
         """Derive the privkey used for the revocation of side's commitment transaction."""
@@ -1178,7 +1176,11 @@ def test_simple_commitment() -> None:
     # x_local_per_commitment_secret: 1f1e1d1c1b1a191817161514131211100f0e0d0c0b0a0908070605040302010001
 
     # This is not derived as expected, but defined :(
-    c.keyset[Side.local].raw_per_commit_secret = lambda _: coincurve.PrivateKey(bytes.fromhex("1f1e1d1c1b1a191817161514131211100f0e0d0c0b0a09080706050403020100"))  # type: ignore
+    c.keyset[Side.local].raw_per_commit_secret = lambda _: coincurve.PrivateKey(
+        bytes.fromhex(
+            "1f1e1d1c1b1a191817161514131211100f0e0d0c0b0a09080706050403020100"
+        )
+    )  # type: ignore
 
     # BOLT #3:
     # commitment_number: 42
@@ -1975,7 +1977,11 @@ def test_anchor_commitment() -> None:
     # x_local_per_commitment_secret: 1f1e1d1c1b1a191817161514131211100f0e0d0c0b0a0908070605040302010001
 
     # This is not derived as expected, but defined :(
-    c.keyset[Side.local].raw_per_commit_secret = lambda _: coincurve.PrivateKey(bytes.fromhex("1f1e1d1c1b1a191817161514131211100f0e0d0c0b0a09080706050403020100"))  # type: ignore
+    c.keyset[Side.local].raw_per_commit_secret = lambda _: coincurve.PrivateKey(
+        bytes.fromhex(
+            "1f1e1d1c1b1a191817161514131211100f0e0d0c0b0a09080706050403020100"
+        )
+    )  # type: ignore
 
     # BOLT #3:
     # commitment_number: 42

lnprototest/funding.py

@@ -524,15 +524,14 @@ def channel_update(
         if disable:
             channel_flags |= 2
 
-        # BOLT #7: The `message_flags` bitfield is used to indicate the
-        # presence of optional fields in the `channel_update` message:
+        # BOLT #7: The message_flags bitfield is used to provide additional
+        # details about the message:
         #
-        # | Bit Position  | Name                      | Field                            |
-        # | ------------- | ------------------------- | -------------------------------- |
-        # | 0             | `option_channel_htlc_max` | `htlc_maximum_msat`              |
-        message_flags = 0
-        if htlc_maximum_msat:
-            message_flags |= 1
+        # | Bit Position  | Name           |
+        # | ------------- | ---------------|
+        # | 0             | `must_be_one`  |
+        # | 1             | `dont_forward` |
+        message_flags = 1
 
         # Begin with a fake signature.
         update = Message(

lnprototest/runner.py

@@ -12,14 +12,7 @@
 from .utils import privkey_expand
 from .keyset import KeySet
 from abc import ABC, abstractmethod
-from typing import (
-    Dict,
-    Optional,
-    List,
-    Union,
-    Any,
-    Callable,
-)
+from typing import Dict, Optional, List, Union, Any, Callable
 
 
 class Conn(object):