Skip to content
This repository has been archived by the owner on Aug 14, 2019. It is now read-only.

Commit

Permalink
Merge pull request #1035 from urbit/hotfix
Browse files Browse the repository at this point in the history 
release hotfix
  • Loading branch information
@joemfb
joemfb authored Jan 31, 2019
2 parents 21ec2a8 + 91974a8 commit fb65f6e
Show file tree
Hide file tree
Showing 16 changed files with 122 additions and 43 deletions.
2 changes: 1 addition & 1 deletion .travis/pin-parent-pill-pier.url
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
https://ci-piers.urbit.org/zod-5294dec6408f8952d1a8e363362bbb58058852b6.tgz
https://ci-piers.urbit.org/zod-0838dd9396cc6742e8bdd8dfee2e1bf5a782a50d.tgz
2 changes: 1 addition & 1 deletion .travis/pin-vere-commit.txt
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
8807423b01e586579946209828bb1bfa3d6d1c5e
051f31b31e45c57aee5542522c5c38e146f3e012
6 changes: 5 additions & 1 deletion app/eth-manage.hoon
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,15 @@
[%snap * ?]
[ost.hid %snap /hi (snapshot:jael +<.val) +>.val]~
::
%look
%look-ethnode
:_ ~
=/ pul
(need (de-purl:html 'http://eth-mainnet.urbit.org:8545'))
[ost.hid %look /hi |+pul]
::
[%look-kick who=@p]
:_ ~
[ost.hid %look /hi %& who.val]
==
::
++ vein
Expand Down
3 changes: 3 additions & 0 deletions app/hood.hoon
View file
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,7 @@
++ mere-kiln (wrap take-mere):from-kiln
++ mere-kiln-sync (wrap take-mere-sync):from-kiln
++ wake-kiln-overload (wrap take-wake-overload):from-kiln
++ wake-helm-automass (wrap take-wake-automass):from-helm
++ onto-drum (wrap take-onto):from-drum
++ peer-drum (wrap peer):from-drum
++ poke-atom (wrap poke-atom):from-helm
Expand All @@ -166,6 +167,8 @@
++ poke-helm-tlon-add-fora (wrap poke-tlon-add-fora):from-helm
++ poke-helm-tlon-add-stream (wrap poke-tlon-add-stream):from-helm
++ poke-helm-tlon-init-stream (wrap poke-tlon-init-stream):from-helm
++ poke-helm-automass (wrap poke-automass):from-helm
++ poke-helm-cancel-automass (wrap poke-cancel-automass):from-helm
++ poke-hood-sync (wrap poke-sync):from-kiln
++ poke-kiln-commit (wrap poke-commit):from-kiln
++ poke-kiln-info (wrap poke-info):from-kiln
Expand Down
14 changes: 14 additions & 0 deletions gen/hood/automass.hoon
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
:: Helm: show memory usage by vane, on a recurring timer
::
:::: /hoon/automass/hood/gen
::
/? 309
::
::::
::
:- %say
|= $: [now=@da eny=@uvJ bec=beak]
[recur=@dr ~]
~
==
[%helm-automass recur]
13 changes: 13 additions & 0 deletions gen/hood/cancel-automass.hoon
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
::
:::: /hoon/cancel-automass/hood/gen
::
/? 309
::
::::
::
:- %say
|= $: [now=@da eny=@uvJ bec=beak]
~
~
==
[%helm-cancel-automass ~]
22 changes: 22 additions & 0 deletions lib/hood/helm.hoon
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
++ session ::
$: say/sole-share:sole :: console state
mud/(unit (sole-dialog:sole @ud)) :: console dialog
mass-timer/{way/wire nex/@da tim/@dr}
== ::
:: :: ::
:::: :: ::
Expand Down Expand Up @@ -42,6 +43,8 @@
{$nuke wire ship} ::
{$serv wire ?(desk beam)} ::
{$poke wire dock pear} ::
{$rest wire @da} ::
{$wait wire @da} ::
== ::
++ move (pair bone card) :: user-level move
++ pear :: poke fruit
Expand Down Expand Up @@ -93,6 +96,25 @@
|= ~ =< abet
(emit %flog /heft %crud %hax-heft ~)
::
++ poke-automass
|= recur=@dr
=. mass-timer.sez
[/helm/automass (add now recur) recur]
abet:(emit %wait way.mass-timer.sez nex.mass-timer.sez)
::
++ poke-cancel-automass
|= ~
abet:(emit %rest way.mass-timer.sez nex.mass-timer.sez)
::
++ take-wake-automass
|= [way=wire ~]
=. nex.mass-timer.sez (add now tim.mass-timer.sez)
=< abet
%- emil
:~ [%flog /heft %crud %hax-heft ~]
[%wait way.mass-timer.sez nex.mass-timer.sez]
==
::
++ poke-send-hi
|= {her/ship mes/(unit tape)} =< abet
%^ emit %poke /helm/hi/(scot %p her)
Expand Down
7 changes: 3 additions & 4 deletions sys/vane/ames.hoon
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
=, ames
:: this number needs to be below 8
::
=+ protocol-version=6
=+ protocol-version=7
|%
+= move [p=duct q=(wind note:able gift:able)] :: local move
:: |pact: internal packet structures
Expand Down Expand Up @@ -1537,8 +1537,7 @@
::
++ wegh
^- mass
:- %ames
:- %|
:~ fox+[%& fox]
:+ %ames %|
:~ dot+&+fox
==
--
6 changes: 3 additions & 3 deletions sys/vane/behn.hoon
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,9 +81,9 @@
%wegh
:_ state :_ ~
:^ hen %give %mass
:- %behn
:- %|
:~ timers+[%& timers]
:+ %behn %|
:~ timers+&+timers
dot+&+state
==
==
::
Expand Down
14 changes: 7 additions & 7 deletions sys/vane/clay.hoon
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3928,14 +3928,14 @@
$wegh
:_ ..^$ :_ ~
:^ hen %give %mass
:- %clay
:- %|
:~ domestic+[%& rom.ruf]
foreign+[%& hoy.ruf]
:- %object-store :- %|
:~ commits+[%& hut.ran.ruf]
blobs+[%& lat.ran.ruf]
:+ %clay %|
:~ domestic+&+rom.ruf
foreign+&+hoy.ruf
:+ %object-store %|
:~ commits+&+hut.ran.ruf
blobs+&+lat.ran.ruf
==
dot+&+ruf
==
==
::
Expand Down
22 changes: 14 additions & 8 deletions sys/vane/dill.hoon
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
e/(unit mass) ::
f/(unit mass) ::
g/(unit mass) ::
j/(unit mass) ::
== ::
== ::
++ axon :: dill per duct
Expand Down Expand Up @@ -77,7 +78,7 @@
snap=(unit snapshot:jael) :: head start
== ::
[%fake our=ship] :: boot fake
:: XX wegh ::
[%wegh ~]
== ::
++ note :: out request $->
$% {$a note-ames} ::
Expand Down Expand Up @@ -120,6 +121,7 @@
== ::
++ sign-jael ::
$% [%init p=ship] ::
[%mass p=mass]
== ::
++ sign :: in result $<-
$% {$a sign-ames} ::
Expand Down Expand Up @@ -280,6 +282,7 @@
[hen %pass /heft/eyre %e %wegh ~]
[hen %pass /heft/ford %f %wegh ~]
[hen %pass /heft/gall %g %wegh ~]
[hen %pass /heft/jael %j %wegh ~]
moz
==
==
Expand Down Expand Up @@ -374,7 +377,7 @@
|= sih/sign
^+ +>
?- sih
{?($a $b $c $e $f $g) $mass *}
{?($a $b $c $e $f $g $j) $mass *}
(wegt -.sih p.sih)
::
{$a $nice *}
Expand Down Expand Up @@ -428,13 +431,14 @@
::
++ wegh
^- mass
:- %dill
:- %|
:~ all+[%& [hey dug]:all]
:+ %dill %|
:~ hey+&+hey.all
dug+&+dug.all
dot+&+all
==
::
++ wegt
|= {lal/?($a $b $c $e $f $g) mas/mass}
|= {lal/?($a $b $c $e $f $g $j) mas/mass}
^+ +>
=. hef.all
?- lal
Expand All @@ -444,19 +448,21 @@
$e ~?(?=(^ e.hef.all) %double-mass-e hef.all(e `mas))
$f ~?(?=(^ f.hef.all) %double-mass-f hef.all(f `mas))
$g ~?(?=(^ g.hef.all) %double-mass-g hef.all(g `mas))
$j ~?(?=(^ j.hef.all) %double-mass-j hef.all(j `mas))
==
?. ?& ?=(^ a.hef.all)
?=(^ b.hef.all)
?=(^ c.hef.all)
?=(^ e.hef.all)
?=(^ f.hef.all)
?=(^ g.hef.all)
?=(^ j.hef.all)
==
+>.$
%+ done(hef.all [~ ~ ~ ~ ~ ~])
%+ done(hef.all [~ ~ ~ ~ ~ ~ ~])
%mass
=> [hef.all d=wegh]
[%vanes %| ~[u.a u.c d u.e u.f u.g u.b]]
[%vanes %| ~[u.a u.b u.c d u.e u.g u.f u.j]]
--
::
++ ax :: make ++as
Expand Down
13 changes: 7 additions & 6 deletions sys/vane/eyre.hoon
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2296,12 +2296,13 @@
?: ?=($wegh -.task)
:_ ..^$ :_ ~
:^ hen %give %mass
:- %eyre
:- %|
:~ dependencies+[%& liz] sessions+[%& wup] views+[%& wix]
ducts+[%| ~[dead+[%& ded] proxy+[%& pox] outgoing+[%& ask]]]
hosts+[%& dop]
misc+[%& bol]
:+ %eyre %|
:~ dependencies+&+liz
sessions+&+wup
views+&+wix
ducts+[%| ~[dead+&+ded proxy+&+pox outgoing+&+ask]]
hosts+&+dop
dot+&+bol
==
=+ ska=(sloy ski)
=+ sky=|=({* *} `(unit)`=+(a=(ska +<) ?~(a ~ ?~(u.a ~ [~ u.u.a]))))
Expand Down
13 changes: 5 additions & 8 deletions sys/vane/ford.hoon
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6196,14 +6196,11 @@
:_ ~
:^ duct %give %mass
^- mass
:- %ford
:- %|
:~ ^- mass
:+ (scot %p our) %|
::
:~ [%builds [%& builds.state.ax]]
[%compiler-cache [%& compiler-cache.state.ax]]
== ==
:+ %ford %|
:~ builds+&+builds.state.ax
compiler-cache+&+compiler-cache.state.ax
dot+&+ax
==
==
:: +take: receive a response from another vane
::
Expand Down
9 changes: 5 additions & 4 deletions sys/vane/gall.hoon
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1278,6 +1278,7 @@
$nuke `%a
$ogre `%c
$perm `%c
$rest `%b
$rule `%e
$serv `%e
$snap `%j
Expand Down Expand Up @@ -1330,15 +1331,15 @@
::
$wegh
=/ =mass
=* mas mast.all
:+ (scot %p our) %|
:~ [%foreign [%& sap.mast.all]]
:+ %gall %|
:~ foreign+&+sap.mast.all
:+ %blocked %|
(sort ~(tap by (~(run by wub.mast.all) |=(sofa [%& +<]))) aor)
:+ %active %|
(sort ~(tap by (~(run by bum.mast.all) |=(seat [%& +<]))) aor)
dot+&+all
==
=/ =move [hen %give %mass %gall %| [mass ~]]
=/ =move [hen %give %mass mass]
[[move ~] ..^$]
==
::
Expand Down
17 changes: 17 additions & 0 deletions sys/vane/jael.hoon
View file
Original file line number Diff line number Diff line change
Expand Up @@ -889,6 +889,23 @@
::
$vine
+>(yen (~(put in yen) hen))
::
%wegh
%_ +>
moz
:_ moz
^- move
:^ hen %give %mass
^- mass
:+ %jael %|
:~ yen+&+yen
urb+&+urb
sub+&+sub
etn+&+etn
sap+&+sap
dot+&+lex
==
==
::
:: authenticated remote request
:: {$west p/ship q/path r/*}
Expand Down
2 changes: 2 additions & 0 deletions sys/zuse.hoon
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1786,6 +1786,7 @@
== == ::
++ gift :: out result <-$
$% [%init p=ship] :: report install unix
[%mass p=mass] :: memory usage report
[%mack p=(unit tang)] :: message n/ack
[%pubs public] :: public keys
[%turf turf=(list turf)] :: domains
Expand Down Expand Up @@ -1862,6 +1863,7 @@
[%vent ~] :: view ethereum events
[%vest ~] :: view public balance
[%vine ~] :: view secret history
[%wegh ~] :: memory usage request
[%west p=ship q=path r=*] :: remote request
[%wind p=@ud] :: rewind before block
== ::
Expand Down

0 comments on commit fb65f6e

Please sign in to comment.