Use embedded solcjs compiler instead of trying to download.

stratisdevex · Jan 26, 2024 · 709ad4a · 709ad4a
1 parent e22a8a1
commit 709ad4a
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 2 deletions.
diff --git a/src/Stratis.DevEx.Base/Runtime.cs b/src/Stratis.DevEx.Base/Runtime.cs
@@ -3,6 +3,7 @@ namespace Stratis.DevEx
     using System;
     using System.IO;
     using System.Linq;
+    using System.Net;
     using System.Reflection;
     using System.Threading;
 
@@ -447,6 +448,40 @@ public static void CopyDirectory(string sourceDir, string destinationDir, bool r
             op.Complete();
         }
 
+        public static async Task<bool> DownloadFileAsync(string name, Uri downloadUrl, string downloadPath)
+        {
+#pragma warning disable SYSLIB0014 // Type or member is obsolete
+            using (var op = Begin("Downloading {0} from {1} to {2}", name, downloadUrl, downloadPath))
+            {
+                using (var client = new WebClient())
+                {
+                    try
+                    {
+                        var b = await client.DownloadDataTaskAsync(downloadUrl);
+                        if (b != null)
+                        {
+                            File.WriteAllBytes(downloadPath, b);
+                            op.Complete();
+                            return true;
+                        }
+                        else
+                        {
+                            op.Abandon();
+                            Error("Downloading {file} to {path} from {url} did not return any data.", name, downloadPath, downloadUrl);
+                            return false;
+                        }
+                    }
+                    catch (Exception ex) 
+                    {
+                        op.Abandon();
+                        Error(ex, "Exception thrown downloading {file} to {path} from {url}.", name, downloadPath, downloadUrl);
+                        return false;
+                    }
+                }
+            }
+#pragma warning restore SYSLIB0014 // Type or member is obsolete
+        }
+
         public static string ViewFilePath(string path, string? relativeTo = null)
         {
             if (!DebugEnabled)

diff --git a/src/Stratis.VS.StratisEVM/SolidityLanguageClient.cs b/src/Stratis.VS.StratisEVM/SolidityLanguageClient.cs
@@ -147,6 +147,18 @@ public async Task<Connection> ActivateAsync(CancellationToken token)
                 if (CheckRunCmdOutput(output, "Run `npm audit` for details."))
                 {
                     Info("VSCode Solidity language server installed.");
+                    /*
+                    if (await DownloadFileAsync("soljson-v0.8.23+commit.f704f362.js", new Uri("https://ajb.nyc3.cdn.digitaloceanspaces.com/soljson-v0.8.23+commit.f704f362.js"), Path.Combine(StratisDevDir, "soljson-v0.8.23+commit.f704f362.js")))
+                    {
+                        Info("VSCode Solidity language server installed.");
+                    }
+                    else
+                    {
+                        Error("Could not download Solidity compiler.");
+                        Error("Could not install VSCode Solidity language server.");
+                        return null;
+                    }
+                    */
                 }
                 else
                 {

diff --git a/src/Stratis.VS.StratisEVM/SolidityLanguageSettings.json b/src/Stratis.VS.StratisEVM/SolidityLanguageSettings.json
@@ -3,6 +3,5 @@
   "solidity.telemetry": false,
   "solidity.maxNumberOfProblems": 1,
   "solidity.enabledAsYouTypeCompilationErrorCheck": true,
-  "solidity.defaultCompiler": "localFile",
-  "solidity.compileUsingLocalVersion": "C:\\Users\\Allister\\Downloads\\soljson-v0.8.23+commit.f704f362.js"
+  "solidity.defaultCompiler": "embedded"
 }