From c48860849bed3e3f575a694d9c8f1433cbab5c11 Mon Sep 17 00:00:00 2001
From: "Andrew Jackson (Ajax)" <snadrus@gmail.com>
Date: Mon, 4 Dec 2023 10:18:07 -0600
Subject: [PATCH] fix: big-branch cleanups

---
 .vscode/launch.json          | 23 -----------------------
 cmd/lotus-provider/config.go |  2 +-
 cmd/lotus-provider/main.go   | 10 +++++-----
 3 files changed, 6 insertions(+), 29 deletions(-)
 delete mode 100644 .vscode/launch.json

diff --git a/.vscode/launch.json b/.vscode/launch.json
deleted file mode 100644
index 4108afbdc..000000000
--- a/.vscode/launch.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    // 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": "exec",
-            "program": "lotus-provider",
-            "args": ["--db-host=localhost","run"],
-            "env": {
-                "LOTUS_PATH":"~/.lotus-local-net",                                     
-                "LOTUS_MINER_PATH":"~/.lotus-miner-local-net",
-                "LOTUS_SKIP_GENESIS_CHECK":"_yes_",
-                "CGO_CFLAGS_ALLOW":"-D__BLST_PORTABLE__",
-                "CGO_CFLAGS":"-D__BLST_PORTABLE__",
-            }       
-        }
-    ]
-}
\ No newline at end of file
diff --git a/cmd/lotus-provider/config.go b/cmd/lotus-provider/config.go
index fa637fcf3..5bd681429 100644
--- a/cmd/lotus-provider/config.go
+++ b/cmd/lotus-provider/config.go
@@ -65,7 +65,7 @@ func getDefaultConfig(comment bool) (string, error) {
 
 var configSetCmd = &cli.Command{
 	Name:      "set",
-	Aliases:   []string{"add"},
+	Aliases:   []string{"add", "update", "create"},
 	Usage:     "Set a config layer or the base by providing a filename or stdin.",
 	ArgsUsage: "a layer's file name",
 	Flags: []cli.Flag{
diff --git a/cmd/lotus-provider/main.go b/cmd/lotus-provider/main.go
index 9eda6db87..19cc6f5f9 100644
--- a/cmd/lotus-provider/main.go
+++ b/cmd/lotus-provider/main.go
@@ -106,28 +106,28 @@ func main() {
 			},
 			&cli.StringFlag{
 				Name:    "db-name",
-				EnvVars: []string{"LOTUS_DB_NAME"},
+				EnvVars: []string{"LOTUS_DB_NAME", "LOTUS_HARMONYDB_HOSTS"},
 				Value:   "yugabyte",
 			},
 			&cli.StringFlag{
 				Name:    "db-user",
-				EnvVars: []string{"LOTUS_DB_USER"},
+				EnvVars: []string{"LOTUS_DB_USER", "LOTUS_HARMONYDB_USERNAME"},
 				Value:   "yugabyte",
 			},
 			&cli.StringFlag{
 				Name:    "db-password",
-				EnvVars: []string{"LOTUS_DB_PASSWORD"},
+				EnvVars: []string{"LOTUS_DB_PASSWORD", "LOTUS_HARMONYDB_PASSWORD"},
 				Value:   "yugabyte",
 			},
 			&cli.StringFlag{
 				Name:    "db-port",
-				EnvVars: []string{"LOTUS_DB_PORT"},
+				EnvVars: []string{"LOTUS_DB_PORT", "LOTUS_HARMONYDB_PORT"},
 				Hidden:  true,
 				Value:   "5433",
 			},
 			&cli.StringFlag{
 				Name:    "layers",
-				EnvVars: []string{"LOTUS_LAYERS"},
+				EnvVars: []string{"LOTUS_LAYERS", "LOTUS_CONFIG_LAYERS"},
 				Value:   "base",
 			},
 			&cli.StringFlag{