👌 Applied suggestions

LiskHQ · Jul 5, 2024 · 46fc2a4 · 46fc2a4
1 parent 895acd1
commit 46fc2a4
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -101,11 +101,13 @@ The following are the available command-line flags(excluding above wallet flags)
 | ----------------- | --------------------------------------------------- | ------------------------------------------ |
 | -httpport         | Listener port to serve HTTP connection              | 8080                                       |
 | -proxycount       | Count of reverse proxies in front of the server     | 0                                          |
-| -token-address    | Token contract address                              | 0x8a21CF9Ba08Ae709D64Cb25AfAA951183EC9FF6D |
+| -token.address    | Token contract address                              | 0x8a21CF9Ba08Ae709D64Cb25AfAA951183EC9FF6D |
 | -faucet.amount    | Number of ERC20 tokens to transfer per user request | 1                                          |
 | -faucet.minutes   | Number of minutes to wait between funding rounds    | 10080 (1 week)                             |
 | -faucet.name      | Network name to display on the frontend             | sepolia                                    |
 | -faucet.symbol    | Token symbol to display on the frontend             | LSK                                        |
+| -explorer.url     | Block Explorer URL                                  | https://sepolia-blockscout.lisk.com        |
+| -explorer.tx.path | Block explorer transaction path                     | tx                                         |
 | -hcaptcha.sitekey | hCaptcha sitekey                                    |                                            |
 | -hcaptcha.secret  | hCaptcha secret                                     |                                            |
 

diff --git a/cmd/server.go b/cmd/server.go
@@ -20,7 +20,7 @@ var (
 	appVersion = "v1.1.0"
 	chainIDMap = map[string]int{"lisk_sepolia": 4202}
 
-	tokenAddress = flag.String("token-address", os.Getenv("ERC20_TOKEN_ADDRESS"), "Contract address of ERC20 token")
+	tokenAddress = flag.String("token.address", os.Getenv("ERC20_TOKEN_ADDRESS"), "Contract address of ERC20 token")
 
 	httpPortFlag = flag.Int("httpport", 8080, "Listener port to serve HTTP connection")
 	proxyCntFlag = flag.Int("proxycount", 0, "Count of reverse proxies in front of the server")
@@ -31,6 +31,9 @@ var (
 	netnameFlag  = flag.String("faucet.name", "lisk_sepolia", "Network name to display on the frontend")
 	symbolFlag   = flag.String("faucet.symbol", "LSK", "Token symbol to display on the frontend")
 
+	explorerURL    = flag.String("explorer.url", "https://sepolia-blockscout.lisk.com", "Block explorer URL")
+	explorerTxPath = flag.String("explorer.tx.path", "tx", "Block explorer transaction path")
+
 	keyJSONFlag  = flag.String("wallet.keyjson", os.Getenv("KEYSTORE"), "Keystore file to fund user requests with")
 	keyPassFlag  = flag.String("wallet.keypass", "password.txt", "Passphrase text file to decrypt keystore")
 	privKeyFlag  = flag.String("wallet.privkey", os.Getenv("PRIVATE_KEY"), "Private key hex to fund user requests with")
@@ -62,7 +65,7 @@ func Execute() {
 	if err != nil {
 		panic(fmt.Errorf("cannot connect to web3 provider: %w", err))
 	}
-	config := server.NewConfig(*netnameFlag, *symbolFlag, *httpPortFlag, *intervalFlag, *payoutFlag, *proxyCntFlag, *hcaptchaSiteKeyFlag, *hcaptchaSecretFlag)
+	config := server.NewConfig(*netnameFlag, *symbolFlag, *httpPortFlag, *intervalFlag, *payoutFlag, *proxyCntFlag, *hcaptchaSiteKeyFlag, *hcaptchaSecretFlag, *explorerURL, *explorerTxPath)
 	go server.NewServer(txBuilder, config).Run()
 
 	c := make(chan os.Signal, 1)

diff --git a/internal/server/config.go b/internal/server/config.go
@@ -9,9 +9,11 @@ type Config struct {
 	proxyCount      int
 	hcaptchaSiteKey string
 	hcaptchaSecret  string
+	explorerURL     string
+	explorerTxPath  string
 }
 
-func NewConfig(network, symbol string, httpPort, interval, payout, proxyCount int, hcaptchaSiteKey, hcaptchaSecret string) *Config {
+func NewConfig(network, symbol string, httpPort, interval, payout, proxyCount int, hcaptchaSiteKey, hcaptchaSecret, explorerURL, explorerTxPath string) *Config {
 	return &Config{
 		network:         network,
 		symbol:          symbol,
@@ -21,5 +23,7 @@ func NewConfig(network, symbol string, httpPort, interval, payout, proxyCount in
 		proxyCount:      proxyCount,
 		hcaptchaSiteKey: hcaptchaSiteKey,
 		hcaptchaSecret:  hcaptchaSecret,
+		explorerURL:     explorerURL,
+		explorerTxPath:  explorerTxPath,
 	}
 }
diff --git a/internal/server/dto.go b/internal/server/dto.go
@@ -26,6 +26,8 @@ type infoResponse struct {
 	Payout          string `json:"payout"`
 	Symbol          string `json:"symbol"`
 	HcaptchaSiteKey string `json:"hcaptcha_sitekey,omitempty"`
+	ExplorerURL     string `json:"explorer_url"`
+	ExplorerTxPath  string `json:"explorer_txPath"`
 }
 
 type malformedRequest struct {

diff --git a/internal/server/server.go b/internal/server/server.go
@@ -93,6 +93,8 @@ func (s *Server) handleInfo() http.HandlerFunc {
 			Symbol:          s.cfg.symbol,
 			Payout:          strconv.Itoa(s.cfg.payout),
 			HcaptchaSiteKey: s.cfg.hcaptchaSiteKey,
+			ExplorerURL:     s.cfg.explorerURL,
+			ExplorerTxPath:  s.cfg.explorerTxPath,
 		}, http.StatusOK)
 	}
 }

diff --git a/web/src/Faucet.svelte b/web/src/Faucet.svelte
@@ -10,6 +10,8 @@
     payout: 1,
     symbol: 'ETH',
     hcaptcha_sitekey: '',
+    explorer_url: '',
+    explorer_txPath: '',
   };
 
   let mounted = false;