Skip to content

Commit 21b3ff1

Browse files
Merge pull request #180 from tocwex/sl/v1.5.X/scry-failure-fixes-2
v1.5.3: hotfix for %pals scry crash on upgrade (take 2)
2 parents bfd3372 + d1e6778 commit 21b3ff1

14 files changed

Lines changed: 27 additions & 20 deletions

desk/bare/app/fund.hoon

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -482,9 +482,17 @@
482482
?| !(~(has by pf-myn) our.bol) :: pre-v1.1 need any watch paths
483483
=>(scan-vold:watch:audit ?=(^ .)) :: pre-%6 %proj need new-style watch paths
484484
==
485+
=/ kup=? :: in kernel upgrade mode?
486+
=+ .^(dex=rock:tire:clay %cx (en-beam [our.bol %$ da+now.bol] /tire))
487+
=+ .^(duz=(set [dude:gall ?]) %ge (en-beam [our.bol %base da+now.bol] [%$ ~]))
488+
?& ?=([~ [%live *]] (~(get by dex) %base))
489+
(~(has in duz) %dojo %.n)
490+
==
485491
=. cor renew-surl:action
486492
=. cor watch-pals:action
487-
=. cor (renew-projs:action kiq)
493+
:: NOTE: Don't refresh project state during kernel upgrades! This can
494+
:: cause bad level triggers as %pals can be unduly suspended.
495+
=? cor !kup (renew-projs:action kiq)
488496
cor
489497
++ action
490498
|%
@@ -903,9 +911,8 @@
903911
pf-core(cor me-abet:(me-push:(me-abed:me-core lag) pod))
904912
++ pf-is-pals
905913
^- bean
906-
=+ .^(dex=rock:tire:clay %cx (en-beam [our.bol %$ da+now.bol] /tire))
907-
?~ dek=(~(get by dex) %pals) |
908-
?. ?=(%live zest.u.dek) |
914+
=+ .^(duz=(set [=dude:gall live=?]) %ge (en-beam [our.bol %pals da+now.bol] [%$ ~]))
915+
?. (~(has in duz) %pals %.y) |
909916
=+ .^(taz=(set ship) %gx (en-beam [our.bol %pals da+now.bol] /targets/noun))
910917
(~(has in taz) sip)
911918
::

desk/bare/desk.docket-0

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
info+'A sovereign P2P work completion funder/tracker with on-chain settlement.'
33
color+0x11.1111
44
image+'https://sfo3.digitaloceanspaces.com/sarlev-sarsen/sarlev-sarsen/2024.4.29..23.58.31..2b02.0c49.ba5e.353f-IMG_4726.jpeg'
5-
version+[1 5 2]
5+
version+[1 5 3]
66
website+'https://www.tocwexsyndicate.com/'
77
license+'GNU GPLv3'
88
base+'fund'

desk/bare/web/fund/page/asset.hoon

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,4 +87,4 @@
8787
:+ 200 [%content-type (joyn '/' p.mym)] :: 1 week cache time
8888
?:(!<(bean (slot:config %debug)) ~ ['cache-control' 'max-age=604800']~)
8989
--
90-
:: VERSION: [1 5 2]
90+
:: VERSION: [1 5 3]

desk/bare/web/fund/page/config.hoon

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,4 +37,4 @@
3737
(prod-butn:ui:fh %md %false %vita-disable "no ✗" ~ ~)
3838
==
3939
--
40-
:: VERSION: [1 5 2]
40+
:: VERSION: [1 5 3]

desk/bare/web/fund/page/prof-graf.hoon

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -366,4 +366,4 @@
366366
==
367367
==
368368
--
369-
:: VERSION: [1 5 2]
369+
:: VERSION: [1 5 3]

desk/bare/web/fund/page/prof-stat.hoon

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,4 +146,4 @@
146146
==
147147
==
148148
--
149-
:: VERSION: [1 5 2]
149+
:: VERSION: [1 5 3]

desk/bare/web/fund/page/prof-view.hoon

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -229,4 +229,4 @@
229229
==
230230
==
231231
--
232-
:: VERSION: [1 5 2]
232+
:: VERSION: [1 5 3]

desk/bare/web/fund/page/proj-dash.hoon

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -572,4 +572,4 @@
572572
==
573573
==
574574
--
575-
:: VERSION: [1 5 2]
575+
:: VERSION: [1 5 3]

desk/bare/web/fund/page/proj-edit.hoon

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -344,4 +344,4 @@
344344
==
345345
==
346346
--
347-
:: VERSION: [1 5 2]
347+
:: VERSION: [1 5 3]

desk/bare/web/fund/page/proj-next.hoon

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -350,4 +350,4 @@
350350
==
351351
==
352352
--
353-
:: VERSION: [1 5 2]
353+
:: VERSION: [1 5 3]

0 commit comments

Comments
 (0)