Merge pull request #1499 from zmcNotafraid/fix-block-timestamp-test

Fix block timestamp test
Magickbase · Jul 24, 2023 · 1789ee1 · 1789ee1
2 parents ea30fd0 + 4427ca9
commit 1789ee1
Show file tree

Hide file tree

Showing 13 changed files with 64 additions and 49 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -0,0 +1,11 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  - package-ecosystem: "mix" # See documentation for possible values
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "weekly"
diff --git a/assets/package-lock.json b/assets/package-lock.json
diff --git a/assets/package.json b/assets/package.json
@@ -1,5 +1,5 @@
 {
   "dependencies": {
-    "solc": "0.8.20"
+    "solc": "0.8.21"
   }
 }
diff --git a/lib/godwoken_explorer_web/components/layouts/torch.html.heex b/lib/godwoken_explorer_web/components/layouts/torch.html.heex
@@ -2,10 +2,9 @@
   <head>
     <title>Admin</title>
     <link rel="stylesheet" href={ Phoenix.VerifiedRoutes.static_path(@conn, "/torch/theme.css") }>
-    <link rel="icon" href={Phoenix.VerifiedRoutes.static_path(@conn, "/torch/torch-logo.png")}>
   </head>
 
-  <body class={Torch.PageView.body_classes(@conn) }>
+  <body class={Torch.Helpers.body_classes(@conn) }>
     <header>
       <section id="torch-account-info">
         <div class="torch-container">
@@ -32,7 +31,7 @@
       </section>
     </header>
 
-    <%= Torch.FlashView.render("_flash_messages.html", assigns) %>
+  <Torch.Component.flash_messages flash={@conn.assigns.flash} />
     <%= @inner_content %>
     <script src={ Phoenix.VerifiedRoutes.static_path(@conn, "/torch/torch.js") }></script>
   </body>

diff --git a/lib/godwoken_explorer_web/controllers/admin/job_html.ex b/lib/godwoken_explorer_web/controllers/admin/job_html.ex
@@ -2,10 +2,10 @@ defmodule GodwokenExplorerWeb.Admin.JobHTML do
   use GodwokenExplorerWeb, :html
 
   use Phoenix.HTML
-  use Phoenix.View, root: "job_html/"
 
   import Torch.TableView
   import Torch.FilterView
+  import Torch.Component
 
   embed_templates("job_html/*")
 end
diff --git a/lib/godwoken_explorer_web/controllers/admin/job_html/index.html.heex b/lib/godwoken_explorer_web/controllers/admin/job_html/index.html.heex
@@ -71,7 +71,7 @@
           <% end %>
         </tbody>
       </table>
-      <%= render Torch.PaginationView, "_pagination.html", assigns %>
+      <%= Torch.PaginationView.pagination(@conn) %>
     <% else %>
       <p class="torch-no-data">No Jobs match your search.</p>
     <% end %>

diff --git a/lib/godwoken_explorer_web/controllers/admin/smart_contract_html.ex b/lib/godwoken_explorer_web/controllers/admin/smart_contract_html.ex
@@ -1,16 +1,16 @@
 defmodule GodwokenExplorerWeb.Admin.SmartContractHTML do
   use GodwokenExplorerWeb, :html
   use Phoenix.HTML
-  use Phoenix.View, root: "./smart_contract_html/"
 
   import Torch.TableView
   import Torch.FilterView
+  import Torch.Component
 
   embed_templates("smart_contract_html/*")
 
   def error_tag(form, field) do
     Enum.map(Keyword.get_values(form.errors, field), fn error ->
-      content_tag(:span, translate_error(error),
+      content_tag(:span, Torch.Component.translate_error(error),
         class: "invalid-feedback",
         phx_feedback_for: input_name(form, field)
       )

diff --git a/lib/godwoken_explorer_web/controllers/admin/smart_contract_html/index.html.heex b/lib/godwoken_explorer_web/controllers/admin/smart_contract_html/index.html.heex
@@ -66,10 +66,10 @@
               <% end %>
           </tbody>
         </table>
-        <%= render Torch.PaginationView, "_pagination.html" , assigns %>
+        <%= Torch.PaginationView.pagination(@conn) %>
           <% else %>
             <p class="torch-no-data">No Smart contracts match your search.</p>
             <% end %>
     </section>
   </div>
-</section>
+</section>
diff --git a/lib/godwoken_explorer_web/controllers/admin/udt_html.ex b/lib/godwoken_explorer_web/controllers/admin/udt_html.ex
@@ -1,16 +1,17 @@
 defmodule GodwokenExplorerWeb.Admin.UDTHTML do
   use GodwokenExplorerWeb, :html
+
   use Phoenix.HTML
-  use Phoenix.View, root: "udt_html/"
 
   import Torch.TableView
   import Torch.FilterView
+  import Torch.Component
 
   embed_templates("udt_html/*")
 
   def error_tag(form, field) do
     Enum.map(Keyword.get_values(form.errors, field), fn error ->
-      content_tag(:span, translate_error(error),
+      content_tag(:span, Torch.Component.translate_error(error),
         class: "invalid-feedback",
         phx_feedback_for: input_name(form, field)
       )

diff --git a/lib/godwoken_explorer_web/controllers/admin/udt_html/index.html.heex b/lib/godwoken_explorer_web/controllers/admin/udt_html/index.html.heex
@@ -117,10 +117,10 @@
               <% end %>
           </tbody>
         </table>
-        <%= render Torch.PaginationView, "_pagination.html" , assigns %>
+          <%= Torch.PaginationView.pagination(@conn) %>
           <% else %>
             <p class="torch-no-data">No Udts match your search.</p>
             <% end %>
     </section>
   </div>
-</section>
+</section>
diff --git a/mix.exs b/mix.exs
@@ -93,10 +93,10 @@ defmodule GodwokenExplorer.MixProject do
       {:poison, "~> 5.0"},
 
       # admin dashboard
-      {:torch, "~> 5.0.0-rc.1"},
+      {:torch, "~> 5.1.0"},
 
       # CORS
-      {:cors_plug, "~> 2.0"},
+      {:cors_plug, "~> 3.0"},
 
       # monitor
       {:observer_cli, "~> 1.6"},
@@ -114,7 +114,7 @@ defmodule GodwokenExplorer.MixProject do
       {:ex_audit, "~> 0.10.0"},
 
       # jsonapi
-      {:jsonapi, "~> 1.4.0"},
+      {:jsonapi, "~> 1.6.2"},
 
       # tool
       {:timex, "~> 3.0"},