diff --git a/Makefile b/Makefile index 045cb830fc6f389c4ca3c013d9815b5aba6987f7..2391a7208006c9ce42526dca0d31948cc5605bd8 100644 --- a/Makefile +++ b/Makefile @@ -11,7 +11,7 @@ PROTO_GO_FILES_REAL = $(shell find . -path ./vendor -prune -o -type f -name '*.p .PHONY: build build: proto - go build -o shimmer + go build -o goshimmer # Protobuffing .PHONY: proto diff --git a/config.json b/config.json index 1e24d5f01cd6d059c36b0f8770815b41e2fc78bf..e28d03a94750597368472df20ab897f0f9739a89 100644 --- a/config.json +++ b/config.json @@ -30,7 +30,7 @@ "DisableStacktrace": false, "Encoding": "console", "OutputPaths": [ - "shimmer.log" + "goshimmer.log" ] }, "node": { diff --git a/docker.config.json b/docker.config.json index 37dea0df987bfbe4bfa94cd14937ee851c71d71c..1bb3a722ba424a09aedba0d2ae2fe6d35b9312b8 100644 --- a/docker.config.json +++ b/docker.config.json @@ -23,7 +23,7 @@ "Encoding": "console", "OutputPaths": [ "stdout", - "shimmer.log" + "goshimmer.log" ], "DisableEvents": true }, diff --git a/plugins/cli/cli.go b/plugins/cli/cli.go index 39ea901ff1dcc32451c2d96a82859f88a18abc9a..bd362093255aa46f242c20b562551fdb983aa4d3 100644 --- a/plugins/cli/cli.go +++ b/plugins/cli/cli.go @@ -32,7 +32,7 @@ func printUsage() { fmt.Fprintf( os.Stderr, "\n"+ - "SHIMMER\n\n"+ + "GoShimmer\n\n"+ " A lightweight modular IOTA node.\n\n"+ "Usage:\n\n"+ " %s [OPTIONS]\n\n"+ diff --git a/plugins/cli/plugin.go b/plugins/cli/plugin.go index b18b78b37eb50ef5529f9822b63170b6de255ff8..03bbc6faf2c92a3efabc3d96c3f76b09ee4e0d67 100644 --- a/plugins/cli/plugin.go +++ b/plugins/cli/plugin.go @@ -13,7 +13,7 @@ import ( const ( // AppVersion version number - AppVersion = "v0.0.1" + AppVersion = "v0.1.0" // AppName app code name AppName = "GoShimmer" ) @@ -56,15 +56,18 @@ func LoadConfig() { } func configure(ctx *node.Plugin) { - fmt.Println(" _____ _ _ ________ ______ ___ ___________ ") - fmt.Println(" / ___| | | |_ _| \\/ || \\/ || ___| ___ \\") - fmt.Println(" \\ `--.| |_| | | | | . . || . . || |__ | |_/ /") - fmt.Println(" `--. \\ _ | | | | |\\/| || |\\/| || __|| / ") - fmt.Println(" /\\__/ / | | |_| |_| | | || | | || |___| |\\ \\ ") - fmt.Printf(" \\____/\\_| |_/\\___/\\_| |_/\\_| |_/\\____/\\_| \\_| fullnode %s", AppVersion) - fmt.Println() + fmt.Printf(` + _____ ____ _____ _ _ _____ __ __ __ __ ______ _____ + / ____|/ __ \ / ____| | | |_ _| \/ | \/ | ____| __ \ + | | __| | | | (___ | |__| | | | | \ / | \ / | |__ | |__) | + | | |_ | | | |\___ \| __ | | | | |\/| | |\/| | __| | _ / + | |__| | |__| |____) | | | |_| |_| | | | | | | |____| | \ \ + \_____|\____/|_____/|_| |_|_____|_| |_|_| |_|______|_| \_\ + %s +`, AppVersion) fmt.Println() + ctx.Node.Logger.Infof("GoShimmer version %s ...", AppVersion) ctx.Node.Logger.Info("Loading plugins ...") } diff --git a/plugins/statusscreen/ui_header_bar.go b/plugins/statusscreen/ui_header_bar.go index 607be9d4e6b27ba033fb24c4b3a4f5163541d08c..541893d56c1e3ac770bbb065624e575fec0bbaa4 100644 --- a/plugins/statusscreen/ui_header_bar.go +++ b/plugins/statusscreen/ui_header_bar.go @@ -6,6 +6,7 @@ import ( "strconv" "github.com/iotaledger/goshimmer/plugins/autopeering/local" + "github.com/iotaledger/goshimmer/plugins/cli" //"strconv" "time" @@ -49,7 +50,7 @@ func NewUIHeaderBar() *UIHeaderBar { SetBackgroundColor(tcell.ColorDarkMagenta) headerBar.Primitive. - SetColumns(17, 0). + SetColumns(20, 0). SetRows(0). SetBorders(false). AddItem(headerBar.LogoContainer, 0, 0, 1, 1, 0, 0, false). @@ -142,7 +143,7 @@ func (headerBar *UIHeaderBar) Update() { func (headerBar *UIHeaderBar) printLogo() { fmt.Fprintln(headerBar.LogoContainer, "") - fmt.Fprintln(headerBar.LogoContainer, " SHIMMER 0.0.1") + fmt.Fprintln(headerBar.LogoContainer, " GOSHIMMER", cli.AppVersion) fmt.Fprintln(headerBar.LogoContainer, " ┌──────┬──────┐") fmt.Fprintln(headerBar.LogoContainer, " ───┐ │ ┌───") fmt.Fprintln(headerBar.LogoContainer, " ┐ │ │ │ ┌") diff --git a/plugins/ui/files.go b/plugins/ui/files.go index a336e08738e3f3d437a22a6f167346987e02cab9..4d32815b92af1c8787e464fd1e6a925ebb383b1b 100644 --- a/plugins/ui/files.go +++ b/plugins/ui/files.go @@ -213,7 +213,7 @@ body.fade { <meta charset="utf-8"> <meta name="viewport" content="width=device-width, initial-scale=1"> <link rel="shortcut icon" href="ui/favicon.ico"> - <title>Shimmer UI</title> + <title>GoShimmer UI</title> <link rel="stylesheet" href="https://unpkg.com/bulmaswatch@0.7.5/darkly/bulmaswatch.min.css"> <link rel="stylesheet" href="ui/css/styles.css"> </head> @@ -226,7 +226,7 @@ body.fade { <div class="column"> <h1 class="title"> <iota-icon size="42"></iota-icon> - Shimmer + GoShimmer </h1> <span v-if="loggedIn" class="status">Status:<span class="tag is-light">{{synced}}</span> </div> diff --git a/plugins/ui/src/index.html b/plugins/ui/src/index.html index b3825fe06ea35507bd540845894c64578f8f702f..a1ee5924fde84d41b711e9aa2091e301abf1da0a 100644 --- a/plugins/ui/src/index.html +++ b/plugins/ui/src/index.html @@ -5,7 +5,7 @@ <meta charset="utf-8"> <meta name="viewport" content="width=device-width, initial-scale=1"> <link rel="shortcut icon" href="ui/favicon.ico"> - <title>Shimmer UI</title> + <title>GoShimmer UI</title> <link rel="stylesheet" href="https://unpkg.com/bulmaswatch@0.7.5/darkly/bulmaswatch.min.css"> <link rel="stylesheet" href="ui/css/styles.css"> </head> @@ -18,7 +18,7 @@ <div class="column"> <h1 class="title"> <iota-icon size="42"></iota-icon> - Shimmer + GoShimmer </h1> <span v-if="loggedIn" class="status">Status:<span class="tag is-light">{{synced}}</span> </div> diff --git a/runNetwork.sh b/runNetwork.sh index daa942e47e40f6cfd9427101e1c8c54043e6bac5..6b918b58c375183bd2020757dce067f8e89197b1 100755 --- a/runNetwork.sh +++ b/runNetwork.sh @@ -25,8 +25,8 @@ for i in `seq 1 $1`; do GOSSIP_PORT=$((GOSSIP_PORT+1)) mkdir node_$i mkdir node_$i/logs - cp ../shimmer node_$i/ + cp ../goshimmer node_$i/ cd node_$i - ./shimmer --autopeering.port $PEERING_PORT --gossip.port $GOSSIP_PORT --autopeering.address 127.0.0.1 --autopeering.entryNodes 2TwlC5mtYVrCHNKG8zkFWmEUlL0pJPS1DOOC2U4yjwo=@127.0.0.1:14626 --node.LogLevel 4 --node.disablePlugins statusscreen --analysis.serverAddress 127.0.0.1:188 & + ./goshimmer --autopeering.port $PEERING_PORT --gossip.port $GOSSIP_PORT --autopeering.address 127.0.0.1 --autopeering.entryNodes 2TwlC5mtYVrCHNKG8zkFWmEUlL0pJPS1DOOC2U4yjwo=@127.0.0.1:14626 --node.LogLevel 4 --node.disablePlugins statusscreen --analysis.serverAddress 127.0.0.1:188 & cd .. done \ No newline at end of file