gaspersic/go-ethereum
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

cmd: support v1.1 Twitter API in faucet, fix puppeth

Browse Source
This commit is contained in:
Péter Szilágyi
2021-01-04 13:58:46 +02:00
parent 0a3993c558
commit e4571d8c12
4 changed files with 121 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/puppeth/module_faucet.go
View File

@ -46,7 +46,7 @@ ENTRYPOINT [ \
"--faucet.name", "{{.FaucetName}}", "--faucet.amount", "{{.FaucetAmount}}", "--faucet.minutes", "{{.FaucetMinutes}}", "--faucet.tiers", "{{.FaucetTiers}}", \
"--account.json", "/account.json", "--account.pass", "/account.pass" \
{{if .CaptchaToken}}, "--captcha.token", "{{.CaptchaToken}}", "--captcha.secret", "{{.CaptchaSecret}}"{{end}}{{if .NoAuth}}, "--noauth"{{end}} \
{{if .TwitterToken}}, "--twitter.token", "{{.TwitterToken}}",
{{if .TwitterToken}}, "--twitter.token.v1", "{{.TwitterToken}}"{{end}} \
]`
// faucetComposefile is the docker-compose.yml file required to deploy and maintain

18
cmd/puppeth/wizard_faucet.go
View File

@ -102,11 +102,10 @@ func (w *wizard) deployFaucet() {
infos.captchaSecret = w.readPassword()
}
}
// Accessing the twitter api requires a bearer token, request it
// Accessing the Twitter API requires a bearer token, request it
if infos.twitterToken != "" {
fmt.Println()
fmt.Println("Reuse previous twitter API Bearer token (y/n)? (default = yes)")
fmt.Println("Reuse previous Twitter API token (y/n)? (default = yes)")
if !w.readDefaultYesNo(true) {
infos.twitterToken = ""
}
@ -114,17 +113,10 @@ func (w *wizard) deployFaucet() {
if infos.twitterToken == "" {
// No previous twitter token (or old one discarded)
fmt.Println()
fmt.Println("Enable twitter API (y/n)? (default = no)")
if !w.readDefaultYesNo(false) {
log.Warn("The faucet will fallback to using direct calls")
} else {
// Twitter api explicitly requested, read the bearer token
fmt.Println()
fmt.Printf("What is the twitter API Bearer token?\n")
infos.twitterToken = w.readString()
}
fmt.Println()
fmt.Printf("What is the Twitter API app Bearer token?\n")
infos.twitterToken = w.readString()
}
// Figure out where the user wants to store the persistent data
fmt.Println()
if infos.node.datadir == "" {