Merge pull request #24 from Impa10r/v1.2.6

V1.2.6

.env

@@ -0,0 +1 @@
+DEBUG=1

.gitignore

@@ -0,0 +1 @@
+push.sh

.vscode/launch.json

@@ -0,0 +1,18 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "Launch Package",
+            "type": "go",
+            "request": "launch",
+            "mode": "auto",
+            "buildFlags": "-tags lnd",
+            "program": "${workspaceFolder}/cmd/psweb/",
+            "showLog": false,
+            "envFile": "${workspaceFolder}/.env",
+        }
+    ]
+}

.vscode/tasks.json

@@ -0,0 +1,15 @@
+{
+    "version": "2.0.0",
+    "tasks": [
+        {
+            "label": "pre-commit",
+            "type": "shell",
+            "command": "${workspaceFolder}/.git/hooks/pre-commit",
+            "group": "none",
+            "presentation": {
+                "reveal": "never"
+            },
+            "problemMatcher": []
+        }
+    ]
+}

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Versions
 
+## 1.2.6
+
+- Fix bug in conversion to millions
+- Add Makefile, update installation instructions
+
 ## 1.2.5
 
 - Bug fix for peg-in claim not working in v1.2.4

Makefile

@@ -0,0 +1,2 @@
+install:
+	go install ./cmd/psweb

README.md

@@ -45,8 +45,8 @@ Clone the repository and build PeerSwap Web UI:
 
 ```bash
 git clone https://github.com/Impa10r/peerswap-web && \
-cd peerswap-web/cmd/psweb && \
-go install
+cd peerswap-web && \
+make install
 ```
 
 This will install `psweb` to your GOPATH (/home/USER/go/bin). You can check that it is working by running `psweb --version`. If not, add the bin path in .profile and reload with `source .profile`.
@@ -107,8 +107,8 @@ When a new version comes out, just build the app again and restart:
 ```bash
 rm -rf peerswap-web && \
 git clone https://github.com/Impa10r/peerswap-web && \
-cd peerswap-web/cmd/psweb && \
-go install && \
+cd peerswap-web && \
+make install && \
 sudo systemctl restart psweb
 ```
 

cmd/psweb/client.go

@@ -30,7 +30,6 @@ func getClientConn(address string) (*grpc.ClientConn, error) {
 	maxMsgRecvSize := grpc.MaxCallRecvMsgSize(1 * 1024 * 1024 * 200)
 	opts := []grpc.DialOption{
 		grpc.WithDefaultCallOptions(maxMsgRecvSize),
-		//grpc.WithInsecure(),
 		grpc.WithTransportCredentials(insecure.NewCredentials()),
 	}
 

cmd/psweb/main.go

@@ -41,7 +41,7 @@ var (
 	logFile   *os.File
 )
 
-const version = "v1.2.5"
+const version = "v1.2.6"
 
 func main() {
 
@@ -1357,7 +1357,7 @@ func bumpfeeHandler(w http.ResponseWriter, r *http.Request) {
 		}
 
 		if config.PeginTxId == "" {
-			redirectWithError(w, r, "/bitcoin?", errors.New("No pending peg-in"))
+			redirectWithError(w, r, "/bitcoin?", errors.New("no pending peg-in"))
 			return
 		}
 
@@ -1376,7 +1376,7 @@ func bumpfeeHandler(w http.ResponseWriter, r *http.Request) {
 		}
 
 		if tx.OutputDetails[index].Amount == config.PeginAmount {
-			redirectWithError(w, r, "/bitcoin?", errors.New("Peg-in tx has no change, not possible to bump"))
+			redirectWithError(w, r, "/bitcoin?", errors.New("peg-in tx has no change, not possible to bump"))
 			return
 		}
 

cmd/psweb/utils.go

@@ -199,7 +199,7 @@ func toUint(num int64) uint64 {
 }
 
 func toMil(num uint64) string {
-	return fmt.Sprintf("%.1f", float32(num/1000000))
+	return fmt.Sprintf("%.1f", float32(num)/1000000)
 }
 
 func getNodeAlias(key string) string {