diff --git a/README.md b/README.md index 92af653..d81ac0e 100644 --- a/README.md +++ b/README.md @@ -1,32 +1,21 @@ # DAppNodePackage-trustlines -The [Trustlines Protocol](https://trustlines.network/) aims to provide the service of “transfer of value” without actually transferring value. This can be accomplished by leveraging networks of mutual-trust. The [Trustlines Protocol](https://trustlines.network/) is being built to support a range of use cases by leveraging existing networks of mutual trust and mapping trust-based relationships onto trustless infrastructure. - -The official documentation of [Trustlines Network](https://trustlines.network/) can be found [here](https://docs.trustlines.network/) - -Installing the Trustlines Network DAppNode package you can be observer ( a node without an account) , participant ( a node with an address) or validator in case you are a Trustlines validator. - -## How to setup my node as observer - -Just by installing the package this will be the default mode, you don't need to do anything else. - -## How to setup my node as participant - -Please follow this steps after the package installation: - -* Go to File Manager and upload a keystore file with the address you want to use -* Go to the config tab and type the address of the keystore you uploaded, its password and the word participant in the "Role" field -* Hit update environmentvariables - - - - +Trustlines node to participate and securitize the network. +Validators should use the Validator package https://github.com/dappnode/DAppNodePackage-trustlines-validator instead of this one. +## Trustlines +The [Trustlines Protocol](https://trustlines.network/) aims to provide the service of “transfer of value” without actually transferring value. This can be accomplished by leveraging networks of mutual-trust. The [Trustlines Protocol](https://trustlines.network/) is being built to support a range of use cases by leveraging existing networks of mutual trust and mapping trust-based relationships onto trustless infrastructure. +The official documentation of [Trustlines Network](https://trustlines.network/) can be found [here](https://docs.trustlines.network/) +Installing the Trustlines Network DAppNode package you can be observer ( a node without an account) , participant ( a node with an address) or validator in case you are a Trustlines validator. +## License +This project is licensed under the GNU General Public License v3.0 - see the [LICENSE](LICENSE) file for details +## Note +This is early stage software diff --git a/avatar-min.png b/avatar-trustlines.png similarity index 100% rename from avatar-min.png rename to avatar-trustlines.png diff --git a/build/Dockerfile b/build/Dockerfile index 7b99e72..e5d78b0 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -1,8 +1,4 @@ -FROM trustlines/tlbc-testnet:release4044 - -WORKDIR /config/custom/keys/Trustlines - -ADD start_trustlines.sh /usr/local/bin/start_trustlines - -ENTRYPOINT [ "start_trustlines" ] +#FROM trustlines/tlbc-node:release20421 +FROM trustlines/tlbc-node@sha256:c78147db3f7e477c9462f41f7f4de0dd6c738089abda771b55799df66c5da4e4 +ENTRYPOINT /home/parity/parity_wrapper.sh --parity-args ${PARITY_ARGS} \ No newline at end of file diff --git a/build/start_trustlines.sh b/build/start_trustlines.sh deleted file mode 100755 index a766964..0000000 --- a/build/start_trustlines.sh +++ /dev/null @@ -1,58 +0,0 @@ -#!/bin/bash - -PASSWORD_PATH=/config/custom/pass.pwd -ACCOUNTS_PATH=/config/custom/keys/Trustlines/ - -print_banner() { - echo "#####################################################################################################" - echo "## Trustlines not configured to start! ##" - echo "#####################################################################################################" -} - -## If the password is set we save it -if [ -n "${PASSWORD}" ]; then - echo ${PASSWORD} > ${PASSWORD_PATH} -fi - -if [ "${ROLE}" != "" ] && [ "${ROLE}" != "observer" ] && [ "${ROLE}" != "participant" ] && [ "${ROLE}" != "validator" ];then - print_banner - echo "## You've selected an invalid role: ${ROLE}" - echo "## The valid roles are: observer, participant and validator" - echo "##" - echo "## observer" - echo "## - Is the default role" - echo "## - Does only watch for propagated blocks." - echo "## - Non arguments required at all." - echo "##" - echo "## participant" - echo "## - Connects to an account to being able to create transactions." - echo "## - Requires the address argument." - echo "## - Needs the password file and the key-set." - echo "##" - echo "## validator" - echo "## - Connect as authority to the network for validating blocks." - echo "## - Requires the address argument." - echo "## - Needs the password file and the key-set." - echo "#####################################################################################################" - while true; do sleep 5; done - -fi - -# Obeserver is used in case it is set or is empty since it is the default role -# it doesn't need a password or an address -if [ ! -n "${ROLE}" ] || [ "${ROLE}" = "observer" ]; then - /home/parity/parity_wrapper.sh --parity-args $PARITY_ARGS -elif [ ! -f "${PASSWORD_PATH}" ] || [ ! -n "${ADDRESS}" ];then - print_banner - echo "# You need to configure a password and an address to be able to start trustlines as a ${ROLE} " - echo "#####################################################################################################" - while true; do sleep 5; done -elif [ ! "$(find "$ACCOUNTS_PATH" -mindepth 1 -not -name "address_book.json" -print -quit 2>/dev/null)" ]; then - print_banner - echo "##" - echo "# You must upload your keystore file to: ${ACCOUNTS_PATH}" - echo "#####################################################################################################" - while true; do sleep 5; done -else - /home/parity/parity_wrapper.sh --role $ROLE --address $ADDRESS --parity-args $PARITY_ARGS -fi \ No newline at end of file diff --git a/dappnode_package.json b/dappnode_package.json index cdd5afb..e5fec8b 100644 --- a/dappnode_package.json +++ b/dappnode_package.json @@ -1,40 +1,14 @@ { "name": "trustlines.dnp.dappnode.eth", - "version": "0.0.1", - "upstreamVersion": "release4044", + "version": "0.1.0", + "upstreamVersion": "release20421", "shortDescription": "Financial inclusion through OS decentralized systems", - "description": "The Trustlines Protocol aims to provide the service of “transfer of value” without actually transferring value. This can be accomplished by leveraging networks of mutual-trust. The Trustlines Protocol is being built to support a range of use cases by leveraging existing networks of mutual trust and mapping trust-based relationships onto trustless infrastructure", - "avatar": "/ipfs/QmcpEAc5CsaSD5jc1rkmiGtjtpxDaWDMHUWWh2tUgXFhDC", + "description": "Trustlines node to participate and securitize the network.\n\nValidators should install the Validator package http://my.dappnode/#/installer/trustlines-validator.dnp.dappnode.eth instead of this one.\n\nThe Trustlines Protocol aims to provide the service of “transfer of value” without actually transferring value. This can be accomplished by leveraging networks of mutual-trust. The Trustlines Protocol is being built to support a range of use cases by leveraging existing networks of mutual trust and mapping trust-based relationships onto trustless infrastructure", "type": "service", "chain": "ethereum", - "image": { - "path": "trustlines.dnp.dappnode.eth_0.0.1.tar.xz", - "hash": "/ipfs/QmQm8jkGDtefmVmtBBGY5HJ9cMS5EoHKA53cXWXgeK7yyD", - "size": 25629780, - "restart": "always", - "volumes": [ - "data:/data", - "config:/config/custom" - ], - "environment": [ - "ROLE=observer", - "ADDRESS", - "PASSWORD" - ], - "ports": [ - "30300", - "30300/udp" - ] - }, "requirements": { - "minimumDappnodeVersion": "0.2.10" + "minimumDappnodeVersion": "0.2.19" }, - "backup": [ - { - "name": "config", - "path": "/config" - } - ], "style": { "featuredBackground": "linear-gradient(67deg, #140a0a, #512424)", "featuredColor": "white" @@ -43,13 +17,12 @@ "contributors": [ "Eduardo Antuña (https://github.com/eduadiez)" ], - "categories": [ - "Blockchain" - ], + "categories": ["Blockchain"], "links": { - "homepage": "https://github.com/dappnode/DAppNodePackage-trustlines#readme", - "trustlines": "https://trustlines.network", - "explorer": "https://explorelaika.trustlines.foundation" + "homepage": "https://trustlines.network", + "readme": "https://github.com/dappnode/DAppNodePackage-trustlines#readme", + "netstats": "https://netstats.tlbc.trustlines.foundation", + "explorer": "https://explore.tlbc.trustlines.foundation" }, "repository": { "type": "git", @@ -58,5 +31,10 @@ "bugs": { "url": "https://github.com/dappnode/DAppNodePackage-trustlines/issues" }, - "license": "GPL-3.0" + "license": "GPL-3.0", + "runOrder": ["trustlines.dnp.dappnode.eth","trustlines-monitor.dnp.dappnode.eth"], + "dependencies" : { + "trustlines-monitor.dnp.dappnode.eth":"latest" + } } + diff --git a/disclaimer.md b/disclaimer.md new file mode 100644 index 0000000..fe1b4e4 --- /dev/null +++ b/disclaimer.md @@ -0,0 +1,11 @@ +This software is experimental, presented 'as is' and inherently carries risks. By installing it, you acknowledge that DAppNode Association has done its best to mitigate these risks and accept to waive any liability or responsibility for DAppNode in case of any shortage, discrepancy, damage, loss or destruction of any digital asset managed within this DAppNode package. + +This package stores private keys, which will be stored in your DAppNode. Neither DAppNode Association nor the developers of this software can have access to your private key, nor can help you recover it if you lose it. + +You are solely responsible for keeping your private keys and password safe and to perform secure backups, as well as to restrict access to your computer and other equipment. To the extent permitted by applicable law, you agree to be responsible for all activities that have been conducted from your account. You must take all necessary steps to ensure that your private key, password, and recovery phrase remain confidential and secured. + +This is an Alpha version of experimental open source software released as a test version under an MIT license and may contain errors and/or bugs. No guarantee or representations whatsoever is made regarding its suitability (or its use) for any purpose or regarding its compliance with any applicable laws and regulations. Use of the software is at your own risk and discretion and by using the software you acknowledge that you have read this disclaimer, understand its contents, assume all risk related thereto and hereby release, waive, discharge and covenant not to sue DApppNode Association, NodeHodlers nor Brainbot Labs Establishment or any officers, employees or affiliates from and for any direct or indirect liability resulting from the use of the software as permissible by applicable laws and regulations. + +**Privacy Warning** + +Please be aware, that by using the Trustlines Network client, your address and all the transactions relating to it will be stored on the Trustlines Network chain, i.e. on servers of Trustlines node operators and ergo are to a certain extent publicly available. Data present in the Trustlines chain is very unlikely to be able to be changed, removed or deleted from the public arena. diff --git a/docker-compose.yml b/docker-compose.yml index b6d714d..9d6c962 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,19 +1,18 @@ version: '3.4' services: trustlines.dnp.dappnode.eth: - image: 'trustlines.dnp.dappnode.eth:0.0.1' + image: 'trustlines.dnp.dappnode.eth:0.1.0' build: ./build - ports: - - 30300 - - 30300/udp + ports: + - '30302:30302' + - '30302:30302/udp' volumes: - - 'data:/data' - - 'config:/config/custom' + - 'tlbc:/data' + - 'shared:/shared' environment: - - ROLE=observer - - ADDRESS= - - PASSWORD= - PARITY_ARGS= + restart: unless-stopped volumes: - data: {} - config: {} \ No newline at end of file + tlbc: {} + shared: + name: trustlines_shared diff --git a/releases.json b/releases.json index a373f4b..b230c00 100644 --- a/releases.json +++ b/releases.json @@ -1,9 +1,9 @@ { - "0.0.1": { - "hash": "/ipfs/QmNwuhjH7Wv3m5y9wgLnXpzNsGPmasUi9PHRBtytRdaBYP", - "type": "manifest", + "0.1.0": { + "hash": "/ipfs/Qme12JvBjmxXPQSu7BiB22AsEqCGJ94dABDQJwA6WXekRy", + "type": "directory", "uploadedTo": { - "dappnode": "Thu, 26 Sep 2019 14:16:44 GMT" + "dappnode": "Thu, 21 Nov 2019 11:43:06 GMT" } } } \ No newline at end of file