diff --git a/.travis/pin-parent-pill-pier.url b/.travis/pin-parent-pill-pier.url index 435e343e6..d94c28e96 100644 --- a/.travis/pin-parent-pill-pier.url +++ b/.travis/pin-parent-pill-pier.url @@ -1 +1 @@ -https://ci-piers.urbit.org/zod-5294dec6408f8952d1a8e363362bbb58058852b6.tgz +https://ci-piers.urbit.org/zod-0838dd9396cc6742e8bdd8dfee2e1bf5a782a50d.tgz diff --git a/.travis/pin-vere-commit.txt b/.travis/pin-vere-commit.txt index c62a3f7b0..8a2bb70ed 100644 --- a/.travis/pin-vere-commit.txt +++ b/.travis/pin-vere-commit.txt @@ -1 +1 @@ -8807423b01e586579946209828bb1bfa3d6d1c5e +051f31b31e45c57aee5542522c5c38e146f3e012 diff --git a/app/eth-manage.hoon b/app/eth-manage.hoon index d161f40a5..413f7ed95 100644 --- a/app/eth-manage.hoon +++ b/app/eth-manage.hoon @@ -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 diff --git a/app/hood.hoon b/app/hood.hoon index 456d0fc74..c182990dd 100644 --- a/app/hood.hoon +++ b/app/hood.hoon @@ -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 @@ -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 diff --git a/gen/hood/automass.hoon b/gen/hood/automass.hoon new file mode 100644 index 000000000..10198b86d --- /dev/null +++ b/gen/hood/automass.hoon @@ -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] diff --git a/gen/hood/cancel-automass.hoon b/gen/hood/cancel-automass.hoon new file mode 100644 index 000000000..c59434955 --- /dev/null +++ b/gen/hood/cancel-automass.hoon @@ -0,0 +1,13 @@ +:: +:::: /hoon/cancel-automass/hood/gen + :: +/? 309 +:: +:::: + :: +:- %say +|= $: [now=@da eny=@uvJ bec=beak] + ~ + ~ + == +[%helm-cancel-automass ~] diff --git a/lib/hood/helm.hoon b/lib/hood/helm.hoon index 70373aaee..b251fc339 100644 --- a/lib/hood/helm.hoon +++ b/lib/hood/helm.hoon @@ -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} == :: :: :: :: :::: :: :: @@ -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 @@ -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) diff --git a/sys/vane/ames.hoon b/sys/vane/ames.hoon index 120c15027..fc7466688 100644 --- a/sys/vane/ames.hoon +++ b/sys/vane/ames.hoon @@ -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 @@ -1537,8 +1537,7 @@ :: ++ wegh ^- mass - :- %ames - :- %| - :~ fox+[%& fox] + :+ %ames %| + :~ dot+&+fox == -- diff --git a/sys/vane/behn.hoon b/sys/vane/behn.hoon index 50a1b60d5..618e8caf6 100644 --- a/sys/vane/behn.hoon +++ b/sys/vane/behn.hoon @@ -81,9 +81,9 @@ %wegh :_ state :_ ~ :^ hen %give %mass - :- %behn - :- %| - :~ timers+[%& timers] + :+ %behn %| + :~ timers+&+timers + dot+&+state == == :: diff --git a/sys/vane/clay.hoon b/sys/vane/clay.hoon index 82fd732e1..c299beb2b 100644 --- a/sys/vane/clay.hoon +++ b/sys/vane/clay.hoon @@ -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 == == :: diff --git a/sys/vane/dill.hoon b/sys/vane/dill.hoon index 336593453..420963e58 100644 --- a/sys/vane/dill.hoon +++ b/sys/vane/dill.hoon @@ -19,6 +19,7 @@ e/(unit mass) :: f/(unit mass) :: g/(unit mass) :: + j/(unit mass) :: == :: == :: ++ axon :: dill per duct @@ -77,7 +78,7 @@ snap=(unit snapshot:jael) :: head start == :: [%fake our=ship] :: boot fake - :: XX wegh :: + [%wegh ~] == :: ++ note :: out request $-> $% {$a note-ames} :: @@ -120,6 +121,7 @@ == :: ++ sign-jael :: $% [%init p=ship] :: + [%mass p=mass] == :: ++ sign :: in result $<- $% {$a sign-ames} :: @@ -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 == == @@ -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 *} @@ -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 @@ -444,6 +448,7 @@ $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) @@ -451,12 +456,13 @@ ?=(^ 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 diff --git a/sys/vane/eyre.hoon b/sys/vane/eyre.hoon index ff4628137..a3a4a6d2f 100644 --- a/sys/vane/eyre.hoon +++ b/sys/vane/eyre.hoon @@ -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])))) diff --git a/sys/vane/ford.hoon b/sys/vane/ford.hoon index 31261820f..cd02592f9 100644 --- a/sys/vane/ford.hoon +++ b/sys/vane/ford.hoon @@ -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 :: diff --git a/sys/vane/gall.hoon b/sys/vane/gall.hoon index 5eff555a6..747c7f84f 100644 --- a/sys/vane/gall.hoon +++ b/sys/vane/gall.hoon @@ -1278,6 +1278,7 @@ $nuke `%a $ogre `%c $perm `%c + $rest `%b $rule `%e $serv `%e $snap `%j @@ -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 ~] ..^$] == :: diff --git a/sys/vane/jael.hoon b/sys/vane/jael.hoon index d85707fbf..3da51094c 100644 --- a/sys/vane/jael.hoon +++ b/sys/vane/jael.hoon @@ -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/*} diff --git a/sys/zuse.hoon b/sys/zuse.hoon index 722f1efee..a16a77957 100644 --- a/sys/zuse.hoon +++ b/sys/zuse.hoon @@ -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 @@ -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 == ::