Working to support c-lightning new version of c-lightning

clightning4j · Mar 30, 2021 · 005b44e · 005b44e
2 parents 5a80a33 + d830773
commit 005b44e
Show file tree

Hide file tree

Showing 178 changed files with 6,304 additions and 5,878 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -6,9 +6,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v1
-    - name: Set up JDK 1.8
+    - name: Set up JDK 11
       uses: actions/setup-java@v1
       with:
-        java-version: 1.8
+        java-version: 11
+    - name: Check Java Format
+      run: ./gradlew verifyGoogleJavaFormat
     - name: Build with Gradle
       run: ./gradlew compileJava
diff --git a/README.md b/README.md
@@ -1,6 +1,5 @@
 # :zap: JRPClightning :zap:
-![GitHub All Releases](https://img.shields.io/github/downloads/vincenzopalazzo/JRPClightning/total?color=%23ff5722&style=for-the-badge)
-![GitHub top language](https://img.shields.io/github/languages/top/vincenzopalazzo/JRPClightning?color=%23ff5722&style=for-the-badge)
+![Maven Central](https://img.shields.io/maven-central/v/io.github.clightning4j/jrpclightning?style=for-the-badge)
 
 <p align="center">
     <img src="https://i.ibb.co/tKG2Kkq/final-Icon.png" alt="final-Icon" border="0">
@@ -12,7 +11,32 @@ This is a wrapper for c-lightning rpc, this project is inspired by this
 The wrapper aims to be versatile, the final version should allow the user to execute commands even of custom plugins, allowing them to write the code for the command.
 
 ## Status of project :construction:
-The project support some command, if you want try it don't use on the **MAINET** but use **TESTNET**
+The project support some command, if you want try it doesn't use on the **MAINET** but use **TESTNET**
+
+## Repositories
+
+#### Maven
+
+```xml
+<dependency>
+  <groupId>io.github.clightning4j</groupId>
+  <artifactId>jrpclightning</artifactId>
+  <version>0.1.9</version>
+</dependency>
+```
+
+#### Gradle Kotlin DSL
+
+```kotlin
+implementation("io.github.clightning4j:jrpclightning:0.1.8")
+```
+
+#### Gradle groovy DSL
+
+```groovy
+implementation 'io.github.clightning4j:jrpclightning:0.1.8'
+```
+
 
 ## Command Support
 

diff --git a/build.gradle b/build.gradle
@@ -1,6 +1,18 @@
+buildscript {
+    repositories {
+        maven {
+            url "https://plugins.gradle.org/m2/"
+        }
+    }
+    dependencies {
+        classpath "gradle.plugin.com.github.sherter.google-java-format:google-java-format-gradle-plugin:0.9"
+    }
+}
+
 apply plugin: 'java-library'
 apply plugin: 'maven'
 apply plugin: 'signing'
+apply plugin: "com.github.sherter.google-java-format"
 apply from: 'gradle/release.gradle'
 
 repositories {
@@ -25,7 +37,7 @@ dependencies {
 }
 
 task copyLib(type: Copy){
-    from  "${project.buildDir}/libs/jrpclightning-${version}.jar" into '/home/vincent/Github/lightning-rest/libdev/'
+    from  "${project.buildDir}/libs/jrpclightning-${version}-with-dependencies.jar" into '/home/vincent/Github/LNQrcode/devlib'
 }
 
 test {
@@ -37,7 +49,6 @@ test {
 
 jar {
     archiveVersion.set(VERSION as String)
-
     inputs.property("moduleName", MODULE_NAME)
 
     manifest {

diff --git a/docs/index-all.html b/docs/index-all.html
@@ -1403,9 +1403,9 @@ <h2 class="title">T</h2>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="jrpc/clightning/CLightningRPC.html#txDiscard-java.lang.String-">txDiscard(String)</a></span> - Method in class jrpc.clightning.<a href="jrpc/clightning/CLightningRPC.html" title="class in jrpc.clightning">CLightningRPC</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="jrpc/clightning/CLightningRPC.html#txPrepare-java.lang.String-java.lang.String-jrpc.clightning.model.types.bitcoin.BitcoinOutput...-">txPrepare(String, String, BitcoinOutput...)</a></span> - Method in class jrpc.clightning.<a href="jrpc/clightning/CLightningRPC.html" title="class in jrpc.clightning">CLightningRPC</a></dt>
+<dt><span class="memberNameLink"><a href="jrpc/clightning/CLightningRPC.html#txPrepare-java.lang.String-java.lang.String-jrpc.clightning.model.types.bitcoin.BitcoinDestination...-">txPrepare(String, String, BitcoinOutput...)</a></span> - Method in class jrpc.clightning.<a href="jrpc/clightning/CLightningRPC.html" title="class in jrpc.clightning">CLightningRPC</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="jrpc/clightning/CLightningRPC.html#txPrepare-jrpc.clightning.model.types.bitcoin.BitcoinOutput...-">txPrepare(BitcoinOutput...)</a></span> - Method in class jrpc.clightning.<a href="jrpc/clightning/CLightningRPC.html" title="class in jrpc.clightning">CLightningRPC</a></dt>
+<dt><span class="memberNameLink"><a href="jrpc/clightning/CLightningRPC.html#txPrepare-jrpc.clightning.model.types.bitcoin.BitcoinDestination...-">txPrepare(BitcoinOutput...)</a></span> - Method in class jrpc.clightning.<a href="jrpc/clightning/CLightningRPC.html" title="class in jrpc.clightning">CLightningRPC</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="jrpc/clightning/plugins/rpcmethods/manifest/types/Option.html#type">type</a></span> - Variable in class jrpc.clightning.plugins.rpcmethods.manifest.types.<a href="jrpc/clightning/plugins/rpcmethods/manifest/types/Option.html" title="class in jrpc.clightning.plugins.rpcmethods.manifest.types">Option</a></dt>
 <dd>&nbsp;</dd>
@@ -1511,7 +1511,7 @@ <h2 class="title">W</h2>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="jrpc/service/converters/JsonConverter.MyDateTypeAdapter.html#write-com.google.gson.stream.JsonWriter-java.util.Date-">write(JsonWriter, Date)</a></span> - Method in class jrpc.service.converters.<a href="jrpc/service/converters/JsonConverter.MyDateTypeAdapter.html" title="class in jrpc.service.converters">JsonConverter.MyDateTypeAdapter</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="jrpc/service/converters/jsontypeadapter/BitcoinOutputTypeAdapter.html#write-com.google.gson.stream.JsonWriter-jrpc.clightning.model.types.bitcoin.BitcoinOutput-">write(JsonWriter, BitcoinOutput)</a></span> - Method in class jrpc.service.converters.jsontypeadapter.<a href="jrpc/service/converters/jsontypeadapter/BitcoinOutputTypeAdapter.html" title="class in jrpc.service.converters.jsontypeadapter">BitcoinOutputTypeAdapter</a></dt>
+<dt><span class="memberNameLink"><a href="jrpc/service/converters/jsontypeadapter/BitcoinOutputTypeAdapter.html#write-com.google.gson.stream.JsonWriter-jrpc.clightning.model.types.bitcoin.BitcoinDestination-">write(JsonWriter, BitcoinOutput)</a></span> - Method in class jrpc.service.converters.jsontypeadapter.<a href="jrpc/service/converters/jsontypeadapter/BitcoinOutputTypeAdapter.html" title="class in jrpc.service.converters.jsontypeadapter">BitcoinOutputTypeAdapter</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="jrpc/service/converters/jsontypeadapter/FeeRateTypeAdapter.html#write-com.google.gson.stream.JsonWriter-jrpc.clightning.model.CLightningFeeRate-">write(JsonWriter, CLightningFeeRate)</a></span> - Method in class jrpc.service.converters.jsontypeadapter.<a href="jrpc/service/converters/jsontypeadapter/FeeRateTypeAdapter.html" title="class in jrpc.service.converters.jsontypeadapter">FeeRateTypeAdapter</a></dt>
 <dd>&nbsp;</dd>

diff --git a/docs/jrpc/clightning/CLightningRPC.html b/docs/jrpc/clightning/CLightningRPC.html
@@ -381,11 +381,11 @@ <h3>Method Summary</h3>
 </tr>
 <tr id="i44" class="altColor">
 <td class="colFirst"><code><a href="../../jrpc/clightning/model/CLightningBitcoinTx.html" title="class in jrpc.clightning.model">CLightningBitcoinTx</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../jrpc/clightning/CLightningRPC.html#txPrepare-jrpc.clightning.model.types.bitcoin.BitcoinOutput...-">txPrepare</a></span>(<a href="../../jrpc/clightning/model/types/bitcoin/BitcoinOutput.html" title="class in jrpc.clightning.model.types.bitcoin">BitcoinOutput</a>...&nbsp;bitcoinOutputs)</code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../jrpc/clightning/CLightningRPC.html#txPrepare-jrpc.clightning.model.types.bitcoin.BitcoinDestination...-">txPrepare</a></span>(<a href="../../jrpc/clightning/model/types/bitcoin/BitcoinOutput.html" title="class in jrpc.clightning.model.types.bitcoin">BitcoinOutput</a>...&nbsp;bitcoinOutputs)</code>&nbsp;</td>
 </tr>
 <tr id="i45" class="rowColor">
 <td class="colFirst"><code><a href="../../jrpc/clightning/model/CLightningBitcoinTx.html" title="class in jrpc.clightning.model">CLightningBitcoinTx</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../jrpc/clightning/CLightningRPC.html#txPrepare-java.lang.String-java.lang.String-jrpc.clightning.model.types.bitcoin.BitcoinOutput...-">txPrepare</a></span>(java.lang.String&nbsp;feerate,
+<td class="colLast"><code><span class="memberNameLink"><a href="../../jrpc/clightning/CLightningRPC.html#txPrepare-java.lang.String-java.lang.String-jrpc.clightning.model.types.bitcoin.BitcoinDestination...-">txPrepare</a></span>(java.lang.String&nbsp;feerate,
          java.lang.String&nbsp;minconf,
          <a href="../../jrpc/clightning/model/types/bitcoin/BitcoinOutput.html" title="class in jrpc.clightning.model.types.bitcoin">BitcoinOutput</a>...&nbsp;bitcoinOutputs)</code>&nbsp;</td>
 </tr>
@@ -624,7 +624,7 @@ <h4>autoCleanInvoice</h4>
                                          java.lang.String&nbsp;expiredBy)</pre>
 </li>
 </ul>
-<a name="txPrepare-java.lang.String-java.lang.String-jrpc.clightning.model.types.bitcoin.BitcoinOutput...-">
+<a name="txPrepare-java.lang.String-java.lang.String-jrpc.clightning.model.types.bitcoin.BitcoinDestination...-">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -635,7 +635,7 @@ <h4>txPrepare</h4>
                                      <a href="../../jrpc/clightning/model/types/bitcoin/BitcoinOutput.html" title="class in jrpc.clightning.model.types.bitcoin">BitcoinOutput</a>...&nbsp;bitcoinOutputs)</pre>
 </li>
 </ul>
-<a name="txPrepare-jrpc.clightning.model.types.bitcoin.BitcoinOutput...-">
+<a name="txPrepare-jrpc.clightning.model.types.bitcoin.BitcoinDestination...-">
 <!--   -->
 </a>
 <ul class="blockList">

diff --git a/docs/jrpc/clightning/model/types/NetworkAddresses.html b/docs/jrpc/clightning/model/types/NetworkAddresses.html
@@ -98,7 +98,7 @@ <h2 title="Class NetworkAddresses" class="title">Class NetworkAddresses</h2>
 <li>java.lang.Object</li>
 <li>
 <ul class="inheritance">
-<li>jrpc.clightning.model.types.NetworkAddresses</li>
+<li>jrpc.clightning.model.types.NetworkAddress</li>
 </ul>
 </li>
 </ul>

diff --git a/docs/jrpc/clightning/model/types/bitcoin/BitcoinOutput.html b/docs/jrpc/clightning/model/types/bitcoin/BitcoinOutput.html
@@ -98,7 +98,7 @@ <h2 title="Class BitcoinOutput" class="title">Class BitcoinOutput</h2>
 <li>java.lang.Object</li>
 <li>
 <ul class="inheritance">
-<li>jrpc.clightning.model.types.bitcoin.BitcoinOutput</li>
+<li>jrpc.clightning.model.types.bitcoin.BitcoinDestination</li>
 </ul>
 </li>
 </ul>

diff --git a/docs/jrpc/service/converters/jsontypeadapter/BitcoinOutputTypeAdapter.html b/docs/jrpc/service/converters/jsontypeadapter/BitcoinOutputTypeAdapter.html
@@ -155,7 +155,7 @@ <h3>Method Summary</h3>
 </tr>
 <tr id="i1" class="rowColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../jrpc/service/converters/jsontypeadapter/BitcoinOutputTypeAdapter.html#write-com.google.gson.stream.JsonWriter-jrpc.clightning.model.types.bitcoin.BitcoinOutput-">write</a></span>(com.google.gson.stream.JsonWriter&nbsp;out,
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../jrpc/service/converters/jsontypeadapter/BitcoinOutputTypeAdapter.html#write-com.google.gson.stream.JsonWriter-jrpc.clightning.model.types.bitcoin.BitcoinDestination-">write</a></span>(com.google.gson.stream.JsonWriter&nbsp;out,
      <a href="../../../../jrpc/clightning/model/types/bitcoin/BitcoinOutput.html" title="class in jrpc.clightning.model.types.bitcoin">BitcoinOutput</a>&nbsp;value)</code>&nbsp;</td>
 </tr>
 </table>
@@ -204,7 +204,7 @@ <h4>BitcoinOutputTypeAdapter</h4>
 <!--   -->
 </a>
 <h3>Method Detail</h3>
-<a name="write-com.google.gson.stream.JsonWriter-jrpc.clightning.model.types.bitcoin.BitcoinOutput-">
+<a name="write-com.google.gson.stream.JsonWriter-jrpc.clightning.model.types.bitcoin.BitcoinDestination-">
 <!--   -->
 </a>
 <ul class="blockList">

diff --git a/gradle.properties b/gradle.properties
@@ -1,6 +1,6 @@
 GROUP_ID=io.github.clightning4j
 ARTIFACT_ID=jrpclightning
-VERSION=0.1.8
+VERSION=0.1.9-SNAPSHOT
 MODULE_NAME='io.clightning4j.jrpclightning'
 
 #Information abaut the maven repository

diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>io.github.clightning4j</groupId>
   <artifactId>jrpclightning</artifactId>
-  <version>0.1.8</version>
+  <version>0.1.9-SNAPSHOT</version>
   <inceptionYear>2020</inceptionYear>
   <licenses>
     <license>

diff --git a/sandbox/entrypoint.sh b/sandbox/entrypoint.sh
@@ -2,6 +2,5 @@
 ./run-bitcoin.sh
 ./generate-block-bitcoin.sh
 ./run-clightning.sh
-./generate-block-bitcoin.sh
 cd code
-./gradlew test -i
+./gradlew test
diff --git a/sandbox/fund_node_two.sh b/sandbox/fund_node_two.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+DIR=/workdir
+
+# lightning-cli --lightning-dir=$DIR/lightning_dir_two listfunds
+
+for run in {1..2}; do
+  address_two="$(lightning-cli --lightning-dir=$DIR/lightning_dir_two newaddr | jq -r '.bech32')"
+  #echo "${address_two}"
+  # From https://bitcoincore.org/en/doc/0.21.0/rpc/wallet/sendtoaddress/
+  #bitcoin-cli -datadir=$DIR/bitcoin_dir sendtoaddress "${address}" 50 "drinks" "room77" true true null "unset" null 1.1
+  bitcoin-cli -datadir=$DIR/bitcoin_dir -named sendtoaddress address="${address_two}" amount=1 fee_rate=1 > /dev/null
+  address="$(bitcoin-cli -datadir=$DIR/bitcoin_dir getnewaddress)"
+  bitcoin-cli -datadir=$DIR/bitcoin_dir generatetoaddress 50 "${address}" > /dev/null
+done
diff --git a/sandbox/generate-block-bitcoin.sh b/sandbox/generate-block-bitcoin.sh
@@ -1,4 +1,4 @@
 #!/bin/bash
 DIR=/workdir
 address="$(bitcoin-cli -datadir=$DIR/bitcoin_dir getnewaddress)"
-bitcoin-cli -datadir=$DIR/bitcoin_dir generatetoaddress 1000 "${address}"
+bitcoin-cli -datadir=$DIR/bitcoin_dir generatetoaddress 300 "${address}" > /dev/null
diff --git a/sandbox/getinfo-clightnin-nodes.sh b/sandbox/getinfo-clightnin-nodes.sh
diff --git a/sandbox/run-bitcoin.sh b/sandbox/run-bitcoin.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
 DIR=/workdir
-bitcoind -datadir=$DIR/bitcoin_dir -server -regtest -nolisten --daemon
+bitcoind -datadir=$DIR/bitcoin_dir -server -regtest --daemon
 ps aux | grep bitcoind
 bitcoin-cli -datadir=$DIR/bitcoin_dir -rpcwait createwallet "java"
diff --git a/sandbox/run-clightning.sh b/sandbox/run-clightning.sh
@@ -8,13 +8,33 @@ lightningd --lightning-dir=$DIR/lightning_dir_one --log-file=$DIR/lightning_dir_
 lightningd --lightning-dir=$DIR/lightning_dir_two --log-file=$DIR/lightning_dir_two/log.txt --daemon
 
 lightning-cli --lightning-dir=$DIR/lightning_dir_one getinfo > node_one.info
-address="$(lightning-cli --lightning-dir=$DIR/lightning_dir_one newaddr | jq -r '.bech32')"
-echo "${address}"
-# From https://bitcoincore.org/en/doc/0.21.0/rpc/wallet/sendtoaddress/
-bitcoin-cli -datadir=$DIR/bitcoin_dir sendtoaddress "${address}" 50 "drinks" "room77" true true null "unset" null 1.1
+#for run in {1..50}; do
+#  address_one="$(lightning-cli --lightning-dir=$DIR/lightning_dir_one newaddr | jq -r '.bech32')"
+  #echo "${address_one}"
+  # From https://bitcoincore.org/en/doc/0.21.0/rpc/wallet/sendtoaddress/
+  #bitcoin-cli -datadir=$DIR/bitcoin_dir sendtoaddress "${address}" 50 "drinks" "room77" true true null "unset" null 1.1
+#  bitcoin-cli -datadir=$DIR/bitcoin_dir -named sendtoaddress address="${address_one}" amount=1 fee_rate=1 > /dev/null
+#  address="$(bitcoin-cli -datadir=$DIR/bitcoin_dir getnewaddress)"
+#  bitcoin-cli -datadir=$DIR/bitcoin_dir generatetoaddress 6 "${address}" > /dev/null
+#done
+
 
 lightning-cli --lightning-dir=$DIR/lightning_dir_two getinfo > node_two.info
-address="$(lightning-cli --lightning-dir=$DIR/lightning_dir_two newaddr | jq -r '.bech32')"
-echo "${address}"
-# From https://bitcoincore.org/en/doc/0.21.0/rpc/wallet/sendtoaddress/
-bitcoin-cli -datadir=$DIR/bitcoin_dir sendtoaddress "${address}" 50 "drinks" "room77" true true null "unset" null 1.1
+for run in {1..50}; do
+  address_two="$(lightning-cli --lightning-dir=$DIR/lightning_dir_two newaddr | jq -r '.bech32')"
+  #echo "${address_two}"
+  # From https://bitcoincore.org/en/doc/0.21.0/rpc/wallet/sendtoaddress/
+  #bitcoin-cli -datadir=$DIR/bitcoin_dir sendtoaddress "${address}" 50 "drinks" "room77" true true null "unset" null 1.1
+  bitcoin-cli -datadir=$DIR/bitcoin_dir -named sendtoaddress address="${address_two}" amount=1 fee_rate=1 > /dev/null
+  address="$(bitcoin-cli -datadir=$DIR/bitcoin_dir getnewaddress)"
+  bitcoin-cli -datadir=$DIR/bitcoin_dir generatetoaddress 50 "${address}" > /dev/null
+done
+
+## achieve the confirmation channels for sure
+for run in {1..50}; do
+  address="$(bitcoin-cli -datadir=$DIR/bitcoin_dir getnewaddress)"
+  bitcoin-cli -datadir=$DIR/bitcoin_dir generatetoaddress 50 "${address}" > /dev/null
+done
+
+lightning-cli --lightning-dir=$DIR/lightning_dir_one listfunds
+lightning-cli --lightning-dir=$DIR/lightning_dir_two listfunds
diff --git a/sandbox/run_node_two.sh b/sandbox/run_node_two.sh