Add C-lightning v0.8.1

.travis.yml

@@ -4,7 +4,7 @@ services:
 env:
   global:
     - DOCKERBUILDER=greenaddress/core_builder_for_android
-    - DOCKERHASH=06e3e394f41bd389a11ce51a2bb4ec46ff082e86d25f4f90644aad5b4faaf0f1
+    - DOCKERHASH=9e8e2dd9ea172a500e106a87fb116976e466e14d5cbac4307759961b946977a1
     - REPO=https://github.com/bitcoin/bitcoin.git
     - COMMIT=1bc9988993ee84bc814e5a7f33cc90f670a19f6a
     - TARGETHOST=aarch64-linux-android

Dockerfile

@@ -1,3 +1,3 @@
-FROM debian:buster@sha256:41f76363fd83982e14f7644486e1fb04812b3894aa4e396137c3435eaf05de88
+FROM debian:buster@sha256:79f0b1682af1a6a29ff63182c8103027f4de98b22d8fb50040e9c4bb13e3de78
 COPY /buster_deps.sh /
 RUN /buster_deps.sh

buster_deps.sh

@@ -7,7 +7,7 @@ sha256_file=8381c440fe61fcbb01e209211ac01b519cd6adf51ab1c2281d5daad6ca4c8c8c
 
 apt-get -yqq update &> /dev/null
 apt-get -yqq upgrade &> /dev/null
-apt-get -yqq install python curl build-essential libtool autotools-dev automake pkg-config bsdmainutils unzip git &> /dev/null
+apt-get -yqq install python python3-{pip,virtualenv,mako} curl build-essential libtool autotools-dev automake pkg-config bsdmainutils unzip git gettext &> /dev/null
 
 mkdir -p /opt
 

fetchbuild.sh

@@ -9,25 +9,30 @@ configextra=$5
 target_host=$6
 bits=$7
 
-
 unpackdep() {
-    curl -sL -o tmp.tar.gz $1
-    echo "$2  tmp.tar.gz" | sha256sum --check
-    tar xzf tmp.tar.gz
-    rm tmp.tar.gz
+    archive=$(basename $1)
+    curl -sL -o ${archive} $1
+    echo "$2 ${archive}" | sha256sum --check
+    tar xf ${archive}
+    rm ${archive}
 }
 
+# build lightning deps
+LNBUILDROOT=$PWD/ln_build_root
+mkdir $LNBUILDROOT
 
 export ANDROID_NDK_HOME=/opt/android-ndk-r20b
 export PATH=$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/bin:${PATH}
-export AR=${target_host/v7a/}-ar
-export AS=${target_host}21-clang
-export CC=${target_host}21-clang
-export CXX=${target_host}21-clang++
-export LD=${target_host/v7a/}-ld
+export AR=${target_host/v7a}-ar
+export AS=${target_host}24-clang
+export CC=${target_host}24-clang
+export CXX=${target_host}24-clang++
+export LD=${target_host/v7a}-ld
 export STRIP=${target_host/v7a}-strip
-export CFLAGS="-flto"
-export LDFLAGS="$CFLAGS -pie -static-libstdc++ -fuse-ld=lld"
+export LDFLAGS="-pie"
+export MAKE_HOST=${target_host/v7a}
+export HOST=${target_host/v7a}
+export CONFIGURATOR_CC="/usr/bin/gcc"
 
 NDKARCH=arm
 if [ "$target_host" = "i686-linux-android" ]; then
@@ -38,16 +43,69 @@ elif [ "$target_host" = "aarch64-linux-android" ]; then
     NDKARCH=arm64
 fi
 
-NDKV=19
-if [ "$bits" = "64" ]; then
-    NDKV=21
-fi
-
 num_jobs=4
 if [ -f /proc/cpuinfo ]; then
     num_jobs=$(grep ^processor /proc/cpuinfo | wc -l)
 fi
 
+## build cln first
+
+# sqlite
+unpackdep https://www.sqlite.org/2018/sqlite-autoconf-3260000.tar.gz 5daa6a3fb7d1e8c767cd59c4ded8da6e4b00c61d3b466d0685e35c4dd6d7bf5d
+cd sqlite-autoconf-3260000
+./configure --enable-static --disable-readline --disable-threadsafe --host=${target_host} CC=$CC --prefix=${LNBUILDROOT}
+make -j $num_jobs
+make install
+cd ..
+rm -rf sqlite-autoconf-3260000
+
+# gmp
+unpackdep https://gmplib.org/download/gmp/gmp-6.1.2.tar.bz2 5275bb04f4863a13516b2f39392ac5e272f5e1bb8057b18aec1c9b79d73d8fb2
+cd gmp-6.1.2
+./configure --enable-static --disable-assembly --host=${target_host} CC=$CC --prefix=${LNBUILDROOT}
+make -j $num_jobs
+make install
+cd ..
+rm -rf gmp-6.1.2
+
+# download lightning
+git clone https://github.com/ElementsProject/lightning.git lightning
+cd lightning
+git checkout v0.8.1
+
+# set virtualenv for lightning
+python3 -m virtualenv venv
+. venv/bin/activate
+pip install -r requirements.txt
+
+# set standard cc for the configurator
+sed -i 's/$CC ${CWARNFLAGS-$BASE_WARNFLAGS} $CDEBUGFLAGS $COPTFLAGS -o $CONFIGURATOR $CONFIGURATOR.c/$CONFIGURATOR_CC ${CWARNFLAGS-$BASE_WARNFLAGS} $CDEBUGFLAGS $COPTFLAGS -o $CONFIGURATOR $CONFIGURATOR.c/g' configure
+sed -i 's/-Wno-maybe-uninitialized/-Wno-uninitialized/g' configure
+./configure CONFIGURATOR_CC=${CONFIGURATOR_CC} --prefix=${LNBUILDROOT} --disable-developer --disable-compat --disable-valgrind --enable-static
+
+cp /repo/lightning-gen_header_versions.h gen_header_versions.h
+# update arch based on toolchain
+sed "s'NDKCOMPILER'${CC}'" /repo/lightning-config.vars > config.vars
+sed "s'NDKCOMPILER'${CC}'" /repo/lightning-config.h > ccan/config.h
+
+# Path the external deps build
+patch -p1 < /repo/lightning-makefile-external-reverts.patch
+# patch makefile
+patch -p1 < /repo/lightning-makefile.patch
+patch -p1 < /repo/lightning-addr.patch
+patch -p1 < /repo/lightning-endian.patch
+
+# build external libraries and source
+make PIE=1 DEVELOPER=0 || echo "continue"
+make clean -C ccan/ccan/cdump/tools
+make LDFLAGS="" CC="${CONFIGURATOR_CC}" LDLIBS="-L/usr/local/lib" -C ccan/ccan/cdump/tools
+make PIE=1 DEVELOPER=0
+deactivate
+cd ..
+
+
+export CFLAGS="-flto"
+export LDFLAGS="$CFLAGS -pie -static-libstdc++ -fuse-ld=lld"
 # build core
 git clone $repo ${reponame}
 cd ${reponame}
@@ -129,7 +187,12 @@ cd ..
 if [ "${reponame}" != "${rename}" ]; then
     mv ${reponame}/depends/${target_host/v7a/}/bin/${reponame}d ${reponame}/depends/${target_host/v7a/}/bin/${rename}d
     mv ${reponame}/depends/${target_host/v7a/}/bin/${reponame}-cli ${reponame}/depends/${target_host/v7a/}/bin/${rename}-cli
-    tar -Jcf /repo/${target_host/v7a/}_${rename}.tar.xz -C ${reponame}/depends/${target_host/v7a/}/bin ${rename}d ${rename}-cli tor
+    outputtar=/repo/${target_host/v7a/}_${rename}.tar
 else
-    tar -Jcf /repo/${target_host/v7a/}_$(basename $(dirname ${repo})).tar.xz -C ${reponame}/depends/${target_host/v7a/}/bin ${rename}d ${rename}-cli tor
+    outputtar=/repo/${target_host/v7a/}_$(basename $(dirname ${repo})).tar
 fi
+tar -cf ${outputtar} -C ${reponame}/depends/${target_host/v7a/}/bin ${rename}d ${rename}-cli tor
+tar -rf ${outputtar} -C lightning/lightningd lightning_channeld lightning_closingd lightning_connectd lightning_gossipd lightning_hsmd lightning_onchaind lightning_openingd lightningd
+tar -rf ${outputtar} -C lightning plugins/autoclean plugins/fundchannel plugins/pay
+tar -rf ${outputtar} -C lightning/cli lightning-cli
+xz ${outputtar}

lightning-addr.patch

@@ -0,0 +1,66 @@
+diff --git a/cli/lightning-cli.c b/cli/lightning-cli.c
+index 5812fb4e9..43ad6a6fb 100644
+--- a/cli/lightning-cli.c
++++ b/cli/lightning-cli.c
+@@ -507,10 +507,11 @@ int main(int argc, char *argv[])
+ 	fd = socket(AF_UNIX, SOCK_STREAM, 0);
+ 	if (strlen(rpc_filename) + 1 > sizeof(addr.sun_path))
+ 		errx(ERROR_USAGE, "rpc filename '%s' too long", rpc_filename);
+-	strcpy(addr.sun_path, rpc_filename);
++	addr.sun_path[0] = '\0';
++	strcpy(addr.sun_path + 1, rpc_filename);
+ 	addr.sun_family = AF_UNIX;
+
+-	if (connect(fd, (struct sockaddr *)&addr, sizeof(addr)) != 0)
++	if (connect(fd, (struct sockaddr *)&addr, sizeof(addr.sun_family) + strlen(rpc_filename) + 1) != 0)
+ 		err(ERROR_TALKING_TO_LIGHTNINGD,
+ 		    "Connecting to '%s'", rpc_filename);
+
+diff --git a/lightningd/jsonrpc.c b/lightningd/jsonrpc.c
+index 8a433cddd..c54a0b5e0 100644
+--- a/lightningd/jsonrpc.c
++++ b/lightningd/jsonrpc.c
+@@ -1121,18 +1121,19 @@ void jsonrpc_listen(struct jsonrpc *jsonrpc, struct lightningd *ld)
+ 	}
+ 	if (strlen(rpc_filename) + 1 > sizeof(addr.sun_path))
+ 		errx(1, "rpc filename '%s' too long", rpc_filename);
+-	strcpy(addr.sun_path, rpc_filename);
++	addr.sun_path[0] = '\0';
++	strcpy(addr.sun_path + 1, rpc_filename);
+ 	addr.sun_family = AF_UNIX;
+
+ 	/* Of course, this is racy! */
+-	if (connect(fd, (struct sockaddr *)&addr, sizeof(addr)) == 0)
++	if (connect(fd, (struct sockaddr *)&addr, sizeof(addr.sun_family) + strlen(rpc_filename) + 1) == 0)
+ 		errx(1, "rpc filename '%s' in use", rpc_filename);
+ 	unlink(rpc_filename);
+
+ 	/* Set the umask according to the desired file mode.  */
+ 	new_umask = ld->rpc_filemode ^ 0777;
+ 	old_umask = umask(new_umask);
+-	if (bind(fd, (struct sockaddr *)&addr, sizeof(addr)))
++	if (bind(fd, (struct sockaddr *)&addr, sizeof(addr.sun_family) + strlen(rpc_filename) + 1))
+ 		err(1, "Binding rpc socket to '%s'", rpc_filename);
+ 	umask(old_umask);
+
+diff --git a/plugins/libplugin.c b/plugins/libplugin.c
+index b7c5d06ee..28f964fbb 100644
+--- a/plugins/libplugin.c
++++ b/plugins/libplugin.c
+@@ -740,11 +740,13 @@ static struct command_result *handle_init(struct command *cmd,
+ 		plugin_err(p, "rpc filename '%.*s' too long",
+ 			   rpctok->end - rpctok->start,
+ 			   buf + rpctok->start);
+-	memcpy(addr.sun_path, buf + rpctok->start, rpctok->end - rpctok->start);
+-	addr.sun_path[rpctok->end - rpctok->start] = '\0';
++	memcpy(addr.sun_path + 1, buf + rpctok->start, rpctok->end - rpctok->start);
++	addr.sun_path[0] = '\0';
++	addr.sun_path[rpctok->end - rpctok->start + 1] = '\0';
+ 	addr.sun_family = AF_UNIX;
+
+-	if (connect(p->rpc_conn->fd, (struct sockaddr *)&addr, sizeof(addr)) != 0) {
++	const size_t len = sizeof(addr.sun_family) + (rpctok->end - rpctok->start) + 1;
++	if (connect(p->rpc_conn->fd, (struct sockaddr *)&addr, len) != 0) {
+ 		with_rpc = false;
+ 		plugin_log(p, LOG_UNUSUAL, "Could not connect to '%.*s': %s",
+ 			   rpctok->end - rpctok->start, buf + rpctok->start,

lightning-config.h

@@ -0,0 +1,90 @@
+/* Generated by CCAN configurator */
+#ifndef CCAN_CONFIG_H
+#define CCAN_CONFIG_H
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE /* Always use GNU extensions. */
+#endif
+#define CCAN_COMPILER "NDKCOMPILER"
+#define CCAN_CFLAGS "-Wall -Wundef -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wold-style-definition -Werror -std=gnu11 -g -fstack-protector -Og"
+#define CCAN_OUTPUT_EXE_CFLAG "-o"
+
+#define HAVE_CCAN 1
+#define HAVE_32BIT_OFF_T 0
+#define HAVE_ALIGNOF 1
+#define HAVE_ASPRINTF 1
+#define HAVE_ATTRIBUTE_COLD 1
+#define HAVE_ATTRIBUTE_CONST 1
+#define HAVE_ATTRIBUTE_DEPRECATED 0
+#define HAVE_ATTRIBUTE_NONNULL 1
+#define HAVE_ATTRIBUTE_SENTINEL 1
+#define HAVE_ATTRIBUTE_PURE 1
+#define HAVE_ATTRIBUTE_MAY_ALIAS 1
+#define HAVE_ATTRIBUTE_NORETURN 1
+#define HAVE_ATTRIBUTE_PRINTF 1
+#define HAVE_ATTRIBUTE_UNUSED 1
+#define HAVE_ATTRIBUTE_USED 1
+#define HAVE_BACKTRACE 0
+#define HAVE_BIG_ENDIAN 0
+#define HAVE_BSWAP_64 0
+#define HAVE_BUILTIN_CHOOSE_EXPR 1
+#define HAVE_BUILTIN_CLZ 1
+#define HAVE_BUILTIN_CLZL 1
+#define HAVE_BUILTIN_CLZLL 1
+#define HAVE_BUILTIN_CTZ 1
+#define HAVE_BUILTIN_CTZL 1
+#define HAVE_BUILTIN_CTZLL 1
+#define HAVE_BUILTIN_CONSTANT_P 1
+#define HAVE_BUILTIN_EXPECT 1
+#define HAVE_BUILTIN_FFS 1
+#define HAVE_BUILTIN_FFSL 1
+#define HAVE_BUILTIN_FFSLL 1
+#define HAVE_BUILTIN_POPCOUNT 1
+#define HAVE_BUILTIN_POPCOUNTL 1
+#define HAVE_BUILTIN_POPCOUNTLL 1
+#define HAVE_BUILTIN_TYPES_COMPATIBLE_P 1
+#define HAVE_ICCARM_INTRINSICS 0
+#define HAVE_BYTESWAP_H 0
+#define HAVE_CLOCK_GETTIME 1
+#define HAVE_CLOCK_GETTIME_IN_LIBRT 0
+#define HAVE_COMPOUND_LITERALS 1
+#define HAVE_FCHDIR 1
+#define HAVE_ERR_H 1
+#define HAVE_FILE_OFFSET_BITS 0
+#define HAVE_FOR_LOOP_DECLARATION 1
+#define HAVE_FLEXIBLE_ARRAY_MEMBER 1
+#define HAVE_GETPAGESIZE 1
+#define HAVE_ISBLANK 1
+#define HAVE_LITTLE_ENDIAN 1
+#define HAVE_MEMMEM 1
+#define HAVE_MEMRCHR 0
+#define HAVE_MMAP 1
+#define HAVE_PROC_SELF_MAPS 0
+#define HAVE_QSORT_R_PRIVATE_LAST 0
+#define HAVE_STRUCT_TIMESPEC 1
+#define HAVE_SECTION_START_STOP 1
+#define HAVE_STACK_GROWS_UPWARDS 0
+#define HAVE_STATEMENT_EXPR 1
+#define HAVE_SYS_FILIO_H 1
+#define HAVE_SYS_TERMIOS_H 0
+#define HAVE_SYS_UNISTD_H 1
+#define HAVE_TYPEOF 1
+#define HAVE_UNALIGNED_ACCESS 1
+#define HAVE_UTIME 1
+#define HAVE_WARN_UNUSED_RESULT 1
+#define HAVE_OPENMP 0
+#define HAVE_VALGRIND_MEMCHECK_H 0
+#define HAVE_UCONTEXT 0
+#define HAVE_POINTER_SAFE_MAKECONTEXT 0
+#define HAVE_BUILTIN_CPU_SUPPORTS 1
+#define HAVE_GOOD_LIBSODIUM 0
+#define HAVE_SQLITE3_EXPANDED_SQL 1
+#define HAVE_SQLITE3 1
+#define HAVE_POSTGRES 0
+#define HAVE_GCC 0
+#define HAVE_MODERN_GCC 0
+#define HAVE_PWRITEV 0
+#endif /* CCAN_CONFIG_H */
+#define DEVELOPER 0
+#define EXPERIMENTAL_FEATURES 0
+#define COMPAT 0
+#include "../ccan_compat.h"