diff --git a/LICENSE b/LICENSE index fdddb29..f872610 100644 --- a/LICENSE +++ b/LICENSE @@ -22,3 +22,15 @@ ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. For more information, please refer to + +#### ENDS LICENSE + +### Add the below to any code (commented obviously) + +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +# IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR +# OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +# OTHER DEALINGS IN THE SOFTWARE. diff --git a/bitcoin/bitcoin.conf b/bitcoin/bitcoin.conf index 1981079..6d3300a 100644 --- a/bitcoin/bitcoin.conf +++ b/bitcoin/bitcoin.conf @@ -10,7 +10,6 @@ blocksonly=1 maxconnections=8 dbcache=1000 maxmempool=512 -maxconnections=40 maxuploadtarget=5000 port=8333 diff --git a/contrib/README.md b/contrib/README.md new file mode 100644 index 0000000..954d0bb --- /dev/null +++ b/contrib/README.md @@ -0,0 +1,7 @@ +# User contributed utilities + +## Utility Register + +* keysend/ - Experimental Keysend functionality + + diff --git a/contrib/keysend/keysend.sh b/contrib/keysend/keysend.sh new file mode 100755 index 0000000..b15cbc7 --- /dev/null +++ b/contrib/keysend/keysend.sh @@ -0,0 +1,24 @@ +#!/bin/bash + +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +# IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR +# OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +# OTHER DEALINGS IN THE SOFTWARE. + +if [ $# -eq 2 ]; then + DEST=$1 + AMT=$2 + + CMD="docker exec -it lncm_lnd_1 lncli sendpayment" + FULLCMD="${CMD} --keysend ${DEST} ${AMT}" + + RESULT=`${FULLCMD}` + + echo $RESULT +else + echo "usage ${0} " +fi + diff --git a/docker-compose.yml b/docker-compose.yml index 1df4191..a9bcde1 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -17,8 +17,9 @@ services: - ${HOME}/nginx:/etc/nginx restart: on-failure network_mode: host + stop_grace_period: 30s bitcoin: - image: lncm/bitcoind:v0.19.0.1 + image: lncm/bitcoind:v0.19.1 logging: *default-logging volumes: - ${HOME}/bitcoin:/root/.bitcoin @@ -26,8 +27,9 @@ services: - ${HOME}/bitcoin:/data/bitcoin restart: on-failure network_mode: host + stop_grace_period: 2m30s lnd: - image: lncm/lnd:v0.9.1-root-experimental + image: lncm/lnd:v0.9.2-root-experimental logging: *default-logging volumes: - ${HOME}/lnd:/data/.lnd @@ -37,6 +39,7 @@ services: restart: on-failure depends_on: [ bitcoin, web ] network_mode: host + stop_grace_period: 1m30s invoicer: image: "lncm/invoicer:v0.6.6" depends_on: [ bitcoin, lnd ] diff --git a/lnd/lnd.conf b/lnd/lnd.conf index b421875..a2773d4 100644 --- a/lnd/lnd.conf +++ b/lnd/lnd.conf @@ -7,6 +7,8 @@ maxpendingchannels=3 minchansize=10000 alias=LNCM Default Box color=#ffe200 +; 0.9.X keysend functionality +accept-keysend=true ; Makes routing faster but have to use images built with experimental tag [Routing]