ilyakooo0/urbit
1
0
Fork 0
mirror of https://github.com/ilyakooo0/urbit.git synced 2024-12-19 12:51:51 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6431 from urbit/hotfix/fix-clay-rebuild-loop

Browse Source 
hotfix clay rebuild loop
This commit is contained in:
Pyry Kovanen 2023-03-28 21:02:13 +03:00 committed by GitHub
commit bddd73d9dc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/arvo/lib/hood/kiln.hoon
View File

@ -583,15 +583,13 @@
..abet ..abet
=/ kel i.wic =/ kel i.wic
%- emil %- emil
=/ cards =/ desks=(list [=desk =zest])
%+ murn ~(tap by rock) %+ murn ~(tap by rock)
|= [=desk =zest wic=(set weft)] |= [=desk =zest wic=(set weft)]
?: |(=(%base desk) !?=(%live zest) (~(has in wic) kel)) ?: |(=(%base desk) !?=(%live zest) (~(has in wic) kel))
~ ~
`u=[%pass /kiln/bump/[desk] %arvo %c %zest desk %held] `u=[desk %held]
?~ cards [%pass /kiln/bump/zeal %arvo %c %zeal desks]~
[%pass /kiln/bump/wick %arvo %c %wick ~]~
cards
:: ::
++ poke-cancel ++ poke-cancel
|= a=@tas |= a=@tas

1
pkg/arvo/sys/lull.hoon
View File

@ -801,6 +801,7 @@
[%warp wer=ship rif=riff] :: internal file req [%warp wer=ship rif=riff] :: internal file req
[%werp who=ship wer=ship rif=riff-any] :: external file req [%werp who=ship wer=ship rif=riff-any] :: external file req
[%wick ~] :: try upgrade [%wick ~] :: try upgrade
[%zeal lit=(list [=desk =zest])] :: batch zest
[%zest des=desk liv=zest] :: live [%zest des=desk liv=zest] :: live
$>(%plea vane-task) :: ames request $>(%plea vane-task) :: ames request
== :: == ::

17
pkg/arvo/sys/vane/clay.hoon
View File

@ -5018,9 +5018,22 @@
:: ::
%wick %wick
=^ mos ruf =^ mos ruf
=/ den ((de now rof hen ruf) our %base) abet:wick:((de now rof hen ruf) our %base) :: [wick]
abet:wick:den :: [wick]
[mos ..^$] [mos ..^$]
::
%zeal
=^ m1 ruf
=| mos=(list move)
|- ^+ [mos ruf]
?~ lit.req
[mos ruf]
=/ den ((de now rof hen ruf) our desk.i.lit.req)
=^ mos-new ruf abet:(set-zest:den zest.i.lit.req)
$(mos (weld mos mos-new), lit.req t.lit.req)
=^ m2 ruf
abet:wick:((de now rof hen ruf) our %base)
=^ m3 ruf abet:goad:(lu now rof hen ruf)
[:(weld m1 m2 m3) ..^$]
:: ::
%zest %zest
=^ m1 ruf =^ m1 ruf