Merge pull request #78 from nervosnetwork/release/v0.2.1

ashchan · web-flow · commit 8021ac71512e · 2021-04-30T19:38:35.000+09:00
Release/v0.2.1
diff --git a/README.md b/README.md
@@ -25,12 +25,26 @@ Tippy is pre-built as self-contained .Net Core application. You don't have to in
 * Make `Tippy` executable: `chmod +x ./tippy-linux-x64/Tippy`
 * `cd tippy-linux-x64` then run `./Tippy` to start
 
+We also provide a Homebrew formula to install with one-liner:
+
+```
+brew install nervosnetwork/tap/tippy-linux
+```
+
+Then simply run `tippy` to start
+
 ### On macOS:
 
 * Download `Tippy.dmg`
 * Open the dmg file and drag `Tippy.app` to `/Applications` folder
 * From `/Applications` click `Tippy.app` to start
 
+We also provide a Homebrew cask to install with one-liner:
+
+```
+brew install nervosnetwork/tap/tippy
+```
+
 ### Tippy Console and UI
 
 While Tippy runs as a console application, it also provides web UI. By default the dashboard UI will be opened automatically, if not you can access it by visiting [http://localhost:5000/Home](http://localhost:5000/Home) from a browser.
diff --git a/debugger.png b/debugger.png
diff --git a/src/Tippy.Ctrl/Process/BinariesInfo.cs b/src/Tippy.Ctrl/Process/BinariesInfo.cs
@@ -5,8 +5,10 @@ namespace Tippy.Ctrl.Process
 {
     internal class BinariesInfo
     {
-        internal string Info { get; private set; } = "";
-        List<string> binaries = new List<string> { "ckb", "ckb-indexer", "ckb-debugger"/*, "ckb-cli"*/ };
+        internal string Info { get; private set; } = "";
+        internal bool HasDebuggerDeps { get; private set; } = false;
+
+        readonly List<string> binaries = new() { "ckb", "ckb-indexer", "ckb-debugger"/*, "ckb-cli"*/ };
 
         internal void Refresh()
         {
@@ -37,6 +39,34 @@ internal void Refresh()
                 process.BeginOutputReadLine();
                 process.WaitForExit();
             }
+
+            if (!OperatingSystem.IsWindows())
+            {
+                RefreshDebuggerDeps();
+            }
+        }
+
+        void RefreshDebuggerDeps()
+        {
+            HasDebuggerDeps = true;
+            // BUGBUG: .Net won't find commands on M1 Mac which has homebrew location at `/opt/homebrew/bin`.
+            foreach (var dep in new List<string>() { "gdb", "ttyd" })
+            {
+                try
+                {
+                    System.Diagnostics.Process process = new();
+                    process.StartInfo.UseShellExecute = false;
+                    process.StartInfo.FileName = dep;
+                    process.StartInfo.Arguments = "--version";
+                    process.StartInfo.WorkingDirectory = Core.Environment.GetAppDataFolder();
+                    process.Start();
+                    process.WaitForExit();
+                }
+                catch
+                {
+                    HasDebuggerDeps = false;
+                }
+            }
         }
     }
 }
diff --git a/src/Tippy.Ctrl/ProcessManager.cs b/src/Tippy.Ctrl/ProcessManager.cs
@@ -22,6 +22,8 @@ public class ProcessManager
         /// </summary>
         public static string Info { get; private set; } = "";
 
+        public static bool DebuggerDepsInstalled { get; private set; } = false;
+
         public enum MinerMode
         {
             Default,
@@ -71,6 +73,7 @@ public static void FetchInfo()
             BinariesInfo binariesInfo = new();
             binariesInfo.Refresh();
             Info = binariesInfo.Info;
+            DebuggerDepsInstalled = binariesInfo.HasDebuggerDeps;
         }
 
         /// If any port is already in use, throw InvalidOperationException.
diff --git a/src/Tippy/Pages/FailedTransactions/Details.cshtml b/src/Tippy/Pages/FailedTransactions/Details.cshtml
@@ -35,13 +35,27 @@
                         @foreach (var (input, index) in Model.DisplayInputs.Select((o, i) => (o, i)))
                         {
                             <div class="column is-10">
-                                <a asp-page="/Debugger/Details" asp-route-txId="@Model.ID" asp-route-ioIndex="@index" asp-route-ioType="input" asp-route-scriptType="0" class="button">Debug Input @index Lock</a>
+                              @if (Model.DebuggerDepsInstalled)
+                              {
+                                  <a asp-page="/Debugger/Details" asp-route-txId="@Model.ID" asp-route-ioIndex="@index" asp-route-ioType="input" asp-route-scriptType="0" class="button">Debug Input @index Lock</a>
+                              }
+                              else
+                              {
+                                  <a class="button" href="#" disabled>Debug Input @index Lock</a>
+                              }
                             </div>
 
                             <div class="column is-10">
                                 @if (input.Type != null)
                                 {
-                                    <a asp-page="/Debugger/Details" asp-route-txId="@Model.ID" asp-route-ioIndex="@index" asp-route-ioType="input" asp-route-scriptType="1" class="button">Debug Input @index Type</a>
+                                    @if (Model.DebuggerDepsInstalled)
+                                    {
+                                        <a asp-page="/Debugger/Details" asp-route-txId="@Model.ID" asp-route-ioIndex="@index" asp-route-ioType="input" asp-route-scriptType="1" class="button">Debug Input @index Type</a>
+                                    }
+                                    else
+                                    {
+                                        <a class="button" href="#" disabled>Debug Input @index Type</a>
+                                    }
                                 }
                             </div>
                         }
@@ -51,7 +65,14 @@
                             <div class="column is-10">
                                 @if (Model.ParsedTransaction!.Outputs[index].Type != null)
                                 {
-                                    <a asp-page="/Debugger/Details" asp-route-txId="@Model.ID" asp-route-ioIndex="@index" asp-route-ioType="output" asp-route-scriptType="1" class="button">Debug Output @index Type</a>
+                                    @if (Model.DebuggerDepsInstalled)
+                                    {
+                                        <a asp-page="/Debugger/Details" asp-route-txId="@Model.ID" asp-route-ioIndex="@index" asp-route-ioType="output" asp-route-scriptType="1" class="button">Debug Output @index Type</a>
+                                    }
+                                    else
+                                    {
+                                        <a class="button" href="#" disabled>Debug Output @index Type</a>
+                                    }
                                 }
                             </div>
                         }
diff --git a/src/Tippy/Pages/PageModelBase.cs b/src/Tippy/Pages/PageModelBase.cs
@@ -27,6 +27,7 @@ public class PageModelBase : PageModel
         public EpochView? EpochView { get; set; }
         public String ProcessInfo { get; set; } = "";
         public bool IsDebuggerSupported = !OperatingSystem.IsWindows();
+        public bool DebuggerDepsInstalled { get; set; } = false;
         public Dictionary<string, Token> Tokens { get; set; } = new(); // Token.Hash -> Token
 
         protected PageModelBase(Tippy.Core.Data.TippyDbContext context)
@@ -43,6 +44,7 @@ protected PageModelBase(Tippy.Core.Data.TippyDbContext context)
         public override async Task OnPageHandlerExecutionAsync(PageHandlerExecutingContext context, PageHandlerExecutionDelegate next)
         {
             ProcessInfo = ProcessManager.Info;
+            DebuggerDepsInstalled = ProcessManager.DebuggerDepsInstalled;
 
             Projects = await DbContext.Projects.Include(p => p.Tokens).ToListAsync();
             ActiveProject = await DbContext.Projects.FirstOrDefaultAsync(p => p.IsActive);
diff --git a/src/Tippy/Pages/Transactions/Details.cshtml b/src/Tippy/Pages/Transactions/Details.cshtml
@@ -140,7 +140,14 @@
                     @if (Model.IsDebuggerSupported)
                     {
                         <div class="column is-10">
-                            <a asp-page="/Debugger/Details" asp-route-txHash="@Model.Transaction.Hash" asp-route-ioIndex="@index" asp-route-ioType="input" asp-route-scriptType="0" class="button">Debug this script</a>
+                            @if (Model.DebuggerDepsInstalled)
+                            {
+                                <a asp-page="/Debugger/Details" asp-route-txHash="@Model.Transaction.Hash" asp-route-ioIndex="@index" asp-route-ioType="input" asp-route-scriptType="0" class="button">Debug this script</a>
+                            }
+                            else
+                            {
+                                <a class="button" href="#" disabled>Debug this script</a>
+                            }
                             <Partial name="_DebuggerInfo" />
                         </div>
                     }
@@ -163,7 +170,14 @@
                         @if (Model.IsDebuggerSupported)
                         {
                             <div class="column is-10">
-                                <a asp-page="/Debugger/Details" asp-route-txHash="@Model.Transaction.Hash" asp-route-ioIndex="@index" asp-route-ioType="input" asp-route-scriptType="1" class="button">Debug this script</a>
+                              @if (Model.DebuggerDepsInstalled)
+                              {
+                                  <a asp-page="/Debugger/Details" asp-route-txHash="@Model.Transaction.Hash" asp-route-ioIndex="@index" asp-route-ioType="input" asp-route-scriptType="1" class="button">Debug this script</a>
+                              }
+                              else
+                              {
+                                  <a class="button" href="#" disabled>Debug this script</a>
+                              }
                                 <Partial name="_DebuggerInfo" />
                             </div>
                         }
diff --git a/src/Tippy/Tippy.csproj b/src/Tippy/Tippy.csproj
@@ -8,7 +8,7 @@
     <IsPackable>false</IsPackable>
     <DebugType>embedded</DebugType>
     <UserSecretsId>6e0dc08b-01f2-47f6-8249-66ed1b18f469</UserSecretsId>
-    <Version>0.2.0</Version>
+    <Version>0.2.1</Version>
     <PackageProjectUrl>https://github.com/nervosnetwork/tippy</PackageProjectUrl>
     <RepositoryUrl>https://github.com/nervosnetwork/tippy</RepositoryUrl>
     <Copyright>Copyright (c) Nervos Foundation</Copyright>
diff --git a/tippy.png b/tippy.png
diff --git a/tools/osx/Info.plist b/tools/osx/Info.plist
@@ -9,9 +9,9 @@
     <key>CFBundleIconFile</key>
     <string>Tippy.icns</string>
     <key>CFBundleVersion</key>
-    <string>0.2.0</string>
+    <string>0.2.1</string>
     <key>CFBundleShortVersionString</key>
-    <string>0.2.0</string>
+    <string>0.2.1</string>
     <key>CFBundleExecutable</key>
     <string>main</string>
     <key>CFBundleInfoDictionaryVersion</key>

Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,8 @@ public class ProcessManager`
`22`	`22`	`/// </summary>`
`23`	`23`	`public static string Info { get; private set; } = "";`
`24`	`24`
	`25`	`+ public static bool DebuggerDepsInstalled { get; private set; } = false;`
	`26`	`+`
`25`	`27`	`public enum MinerMode`
`26`	`28`	`{`
`27`	`29`	`Default,`
`@@ -71,6 +73,7 @@ public static void FetchInfo()`
`71`	`73`	`BinariesInfo binariesInfo = new();`
`72`	`74`	`binariesInfo.Refresh();`
`73`	`75`	`Info = binariesInfo.Info;`
	`76`	`+ DebuggerDepsInstalled = binariesInfo.HasDebuggerDeps;`
`74`	`77`	`}`
`75`	`78`
`76`	`79`	`/// If any port is already in use, throw InvalidOperationException.`