From 4724c32d3dbeb37a69f5c17657bfae3562029c4f Mon Sep 17 00:00:00 2001
From: yosoyubik <yosoyubik@gmail.com>
Date: Tue, 14 Dec 2021 09:40:34 +0100
Subject: [PATCH] pill: load azimuth snapshot file with mime mark

---
 bin/solid.pill             |  4 ++--
 pkg/arvo/app/azimuth.hoon  |  8 +-------
 pkg/base-dev/lib/pill.hoon | 11 +++++------
 3 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/bin/solid.pill b/bin/solid.pill
index 1da0adbc3c..78b238d1c2 100644
--- a/bin/solid.pill
+++ b/bin/solid.pill
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c29577dc949ac0689ba3c97ad13b812ea6c3c6cc9d255b770d2da95fd9af84b9
-size 23121802
+oid sha256:f975f09e5a0172427412e275f333b33f880d914f6f741ea43b0b03a48a393ec7
+size 26016203
diff --git a/pkg/arvo/app/azimuth.hoon b/pkg/arvo/app/azimuth.hoon
index 706a5c416d..c669be3aeb 100644
--- a/pkg/arvo/app/azimuth.hoon
+++ b/pkg/arvo/app/azimuth.hoon
@@ -9,14 +9,10 @@
 ::  Generally don't update the snapshot until we have clay tombstoning.
 ::
 /*  snap  %azimuth-snapshot  /app/azimuth/version-0/azimuth-snapshot
-:: /*  snap  %azimuth  /app/azimuth/state/azimuth
 ::  To update, run from dojo:
 ::    -azimuth-snap-state %default 'version-0'
 ::
-::  To recreate from a list of logs:
-::    =e -build-file %/lib/ethereum/hoon
-::    =l .^((list event-log:rpc:e) %gx /=azimuth=/logs/noun)
-::    */app/azimuth/logs/eth-logs &eth-logs l
+::  To recreate from a full list of logs (at /app/azimuth/logs/eth-logs):
 ::    -azimuth-snap-logs %default 'version-0'
 ::
 =/  snap=snap-state  snap
@@ -237,8 +233,6 @@
     ?:  ?=(%disavow -.diff)
       [(jael-update:do [*ship id.diff %disavow ~]~) this]
     ::
-    :: TODO: skip running the logs if we receive a history diff?
-    ::
     =.  logs.state
       ?-  -.diff
         :: %history  loglist.diff
diff --git a/pkg/base-dev/lib/pill.hoon b/pkg/base-dev/lib/pill.hoon
index e5bb8b651a..56e01b6775 100644
--- a/pkg/base-dev/lib/pill.hoon
+++ b/pkg/base-dev/lib/pill.hoon
@@ -1,6 +1,6 @@
 ::  |pill: helper functions for making pills
 ::
-/-  *dice
+/-  dice
 ^?
 |%
 ::
@@ -82,13 +82,12 @@
   =/  lon  .^(arch %cy pax)
   =?  hav  ?=(^ fil.lon)
     :_  hav
-    :+  lyt
-      mark=;;(@tas (head tyl))
+    :-  lyt
     ?.  ?=([%azimuth-snapshot *] tyl)
-      noun=.^(* %cx pax)
+      [mark=;;(@tas (head tyl)) noun=.^(* %cx pax)]
     =;  convert
-      mime=(convert .^(snap-state %cx pax))
-    .^($-(snap-state mime) %cf (weld bas /azimuth-snapshot/mime))
+      mime/(convert .^(snap-state:dice %cx pax))
+    .^($-(snap-state:dice mime) %cf (weld bas /azimuth-snapshot/mime))
   =/  all  ~(tap by dir.lon)
   |-  ^+  hav
   ?~  all  hav