Merge branch 'master' into 3bot-v2

Makefile

@@ -2,6 +2,7 @@ all: install
 
 daemonpkgs = ./cmd/tfchaind
 clientpkgs = ./cmd/tfchainc
+faucetpkgs = ./frontend/tftfaucet
 testpkgs = ./pkg/types ./pkg/persist
 pkgs = $(daemonpkgs) $(clientpkgs) ./pkg/config $(testpkgs)
 
@@ -113,6 +114,16 @@ release-explorer: get_hub_jwt explorer
 	# And also link in a latest
 	curl -b "active-user=tfchain; caddyoauth=$(HUB_JWT)" -X GET "https://hub.grid.tf/api/flist/me/caddy-explorer-$(dockerVersion).flist/link/caddy-explorer.flist"
 
+faucet: release-dir
+	GOOS=linux go build -o ./release/faucet $(faucetpkgs)
+
+release-faucet: faucet get_hub_jwt
+	tar -C ./release -cvzf release/faucet.tar.gz faucet
+	# Upload to hub
+	curl -b "active-user=tfchain; caddyoauth=$(HUB_JWT)" -F file=@./release/faucet.tar.gz "https://hub.grid.tf/api/flist/me/upload"
+	# Merge with caddy
+	curl -b "active-user=tfchain; caddyoauth=$(HUB_JWT)" -X POST --data "[\"tf-official-apps/caddy.flist\", \"tfchain/faucet.flist\"]" "https://hub.grid.tf/api/flist/me/merge/caddy-faucet.flist"
+
 release-explorer-edge: get_hub_jwt explorer-edge
 	# Upload explorer
 	curl -b "active-user=tfchain; caddyoauth=$(HUB_JWT)" -F file=@./release/explorer-$(dockerVersionEdge).tar.gz "https://hub.grid.tf/api/flist/me/upload"
@@ -131,4 +142,4 @@ check-%:
 ineffassign:
 	ineffassign $(pkgs)
 
-.PHONY: all install xc release-images get_hub_jwt check-% ineffassign explorer release-explorer
+.PHONY: all install xc release-images get_hub_jwt check-% ineffassign explorer release-explorer faucet

README.md

@@ -103,6 +103,34 @@ The standard (net) uses the following bootstrap nodes:
 
 Web-ui explorers for the standard (net) are available at https://explorer.threefoldtoken.com and https://explorer2.threefoldtoken.com (if one isn't available try the other one).
 
+## testnet
+
+A public testnet is also provided in the tfchaind binary. It can be connected to using the `--network testnet` flags.
+This way you can connect to a real network, which behaves almost like the real network. It should be noted that this network
+is used to test new features and bug fixes before moving them to the production network. It can also be reset by the developers at any time.
+
+You can request `300 TFT` to play with on tfchain wallet, by pasting your wallet address at <https://faucet.testnet.threefoldtoken.com> and requesting the 300 TFT. You'll receive your
+_testnet_ tokens as soon as the next block is created and added to the _testnet_ chain.
+
+The testnet has the following properties:
+
++ 3000 blockstakes;
++ An average block time of 2 minutes;
++ One TFT equals to 10<sup>9</sup> of the smallest currency unit;
++ Block rewards and miner payouts take rougly one day to mature;
+
+The blockstakes have been distributed equally to 3 block creator nodes. This means that it is not possible to create blocks yourself
+at this time.
+
+The following bootstrap nodes are being used by the testnet:
+
++ bootstrap1.testnet.threefoldtoken.com:23112
++ bootstrap2.testnet.threefoldtoken.com:23112
++ bootstrap3.testnet.threefoldtoken.com:23112
++ bootstrap4.testnet.threefoldtoken.com:23112
+
+A web-ui explorer for the testnet is available at: https://explorer.testnet.threefoldtoken.com and https://explorer2.testnet.threefoldtoken.com (if one isn't available try the other one).
+
 ## devnet
 
 Should you require a local devnet you can do so by starting the daemon
@@ -137,34 +165,6 @@ Should you use another wallet/client, the steps might be different,
 which is fine as long as you use the menmonic given above as seed,
 as the genesis block stakes and coins are attached to that one.
 
-## testnet
-
-A public testnet is also provided in the tfchaind binary. It can be connected to using the `--network testnet` flags.
-This way you can connect to a real network, which behaves almost like the real network. It should be noted that this network
-is used to test new features and bug fixes before moving them to the production network. It can also be reset by the developers
-at any time. As of right now there is no automated way to get tokens on the testnet, though such a feature is planned. For now,
-tokens can aquired by creating a github issue, formatted like: `testnet token request for <address>`. When possible, you will then
-receive some tokens. If you later require more tokens, please reopen your original issue and leave a comment stating you want some more.
-
-The testnet has the following properties:
-
-+ 3000 blockstakes;
-+ An average block time of 2 minutes;
-+ One TFT equals to 10<sup>9</sup> of the smallest currency unit;
-+ Block rewards and miner payouts take rougly one day to mature;
-
-The blockstakes have been distributed equally to 3 block creator nodes. This means that it is not possible to create blocks yourself
-at this time.
-
-The following bootstrap nodes are being used by the testnet:
-
-+ bootstrap1.testnet.threefoldtoken.com:23112
-+ bootstrap2.testnet.threefoldtoken.com:23112
-+ bootstrap3.testnet.threefoldtoken.com:23112
-+ bootstrap4.testnet.threefoldtoken.com:23112
-
-A web-ui explorer for the testnet is available at: https://explorer.testnet.threefoldtoken.com and https://explorer2.testnet.threefoldtoken.com (if one isn't available try the other one).
-
 ## technical information
 
 tfchain is using and build on top of [Rivine][rivine], a generic blockchain protocol, using Proof of Blockstake (PoB), rather than the also popular Proof of Work (PoW). It allows for custom blockchain implementations, hence tfchain is a custom implementation of the [Rivine][rivine] protocol.