Merge pull request urbit#6948 from urbit/next/kelvin/411

Release 411k
sidnym-ladrut · Mar 25, 2024 · bd776eb · bd776eb
2 parents f0ae78d + fa9e62c
commit bd776eb
Show file tree

Hide file tree

Showing 75 changed files with 90,522 additions and 1,455 deletions.
diff --git a/bin/solid.pill b/bin/solid.pill
diff --git a/flake.nix b/flake.nix
@@ -3,7 +3,7 @@
     flake-utils.url = "github:numtide/flake-utils";
     tools = {
       flake = false;
-      url = "github:urbit/tools";
+      url = "github:urbit/tools/d454e2482c3d4820d37db6d5625a6d40db975864";
     };
   };
 

diff --git a/nix/test-fake-ship.nix b/nix/test-fake-ship.nix
@@ -28,17 +28,6 @@ let
     -- 
     
   '';
-  testThread = dojoCommand:
-    pkgs.writeTextFile {
-      name = "${dojoCommand}.hoon";
-      text = ''
-        ${poke}
-        =/  m  (strand ,vase)
-        ;<  [=ship =desk =case]  bind:m  get-beak
-        ;<  ok=?  bind:m  (poke [ship %dojo] %lens-command !>([%$ [%dojo '${dojoCommand}'] [%stdout ~]]))
-        (pure:m !>(ok))
-      '';
-    };
   appThread = generator: app:
     pkgs.writeTextFile {
       name = ":${app}|${generator}.hoon";
@@ -87,11 +76,12 @@ in pkgs.stdenvNoCC.mkDerivation {
 
     sleep 2
 
-    ${click} -k -p -i ${testThread "-test %/tests ~"} ./pier
+    ${click} -c ./pier "[0 %fyrd [%base %test %noun %noun 0]]"
 
     ${click} -k -p -i ${pokeApp "%agents" "noun" "test"} ./pier
     ${click} -k -p -i ${pokeApp "%generators" "noun" "test"} ./pier
     ${click} -k -p -i ${pokeApp "%marks" "noun" "test"} ./pier
+    ${click} -k -p -i ${pokeApp "%threads" "noun" "test"} ./pier
 
     ${click} -k -p -i ${appThread "mass" "hood"} ./pier
     sleep 2

diff --git a/pkg/arvo/app/aqua.hoon b/pkg/arvo/app/aqua.hoon
@@ -85,7 +85,7 @@
     =^  cards  state
       ?+  mark  ~|([%aqua-bad-mark mark] !!)
           %aqua-events     (poke-aqua-events:ac !<((list aqua-event) vase))
-          %pill       (poke-pill:ac !<(pill vase))
+          %pill            (poke-pill:ac !<(pill vase))
           %noun            (poke-noun:ac !<(* vase))
           %azimuth-action  (poke-azimuth-action:ac !<(azimuth-action vase))
       ==
@@ -663,34 +663,55 @@
     (pe ~bud)  ::  XX why ~bud?  need an example
   ::
       %read
-    ?~  pier=(~(get by ships.piers) from.ae)
-      (pe from.ae)
+    ?~  pier=(~(get by ships.piers) ship.from.ae)
+      (pe ship.from.ae)
     =/  cash  (~(get by namespace.u.pier) path.ae)
     |-
     ?^  cash
       ?:  (gth num.ae (lent u.cash))
-        (pe from.ae)
+        (pe ship.from.ae)
       ::TODO  depends on /ted/aqua/ames behavior in a weird indirect way
-      =/  for=@p  `@`(tail for.ae)  ::NOTE  moons & comets not supported
-      =;  task=task-arvo
-        ^$(ae [%event for /a/aqua/fine-response task], thus this)
-      :+  %hear  `lane:ames`[%| `@`from.ae]
+      =/  for=@p  `@`(tail lane.for.ae)  ::NOTE  moons & comets not supported
+      %-  push-events:(pe for)
+      %-  flop  =<  events
+      %+  roll  u.cash
+      |=  [=yowl:ames i=@ud events=(list unix-event)]
+      :-  +(i)
+      :_  events
+      :-  /a/aqua/fine-response/[(scot %ud i)]
+      ^-  task-arvo
+      :+  %hear  `lane:ames`[%| `@`ship.from.ae]
       ^-  blob:ames
-      =/  =shot:ames
-        ::NOTE  dec is important! so dumb!!
-        (sift-shot:ames `@`(snag (dec num.ae) u.cash))
-      ::TODO  runtime needs to update rcvr field also
-      ::NOTE  rcvr life is allowed to be wrong
-      (etch-shot:ames shot(sndr from.ae, rcvr for))
+      %-  etch-shot:ames
+      :*  [sndr=ship.from.ae rcvr=for]
+          req=|  sam=|
+          sndr-tick=life.from.ae
+          rcvr-tick=life.for.ae
+          origin=~
+          content=`@ux`yowl
+      ==
+    ::
     =/  pacs=(unit (list yowl:ames))
+      =/  =path  [%fine %hunk (scot %ud num.ae) '512' path.ae]
       %+  biff
-        (peek-once:(pe from.ae) %ax %$ [%fine %message path.ae])
+        (peek-once:(pe ship.from.ae) %ax %$ path)
       (soft (list yowl:ames))
-    ?~  pacs  (pe from.ae)
+    ?~  pacs  (pe ship.from.ae)
+    =.  u.pacs
+      ::  add request to each response packet payload
+      ::
+      =+  pat=(spat path.ae)
+      =+  wid=(met 3 pat)
+      %-  flop  =<  blobs
+      %+  roll  u.pacs
+      |=  [=yowl:ames num=_1 blobs=(list @ux)]
+      :-  +(num)
+      :_  blobs
+      (can 3 4^num 2^wid wid^`@`pat (met 3 yowl)^yowl ~)
     =.  namespace.u.pier
       (~(put by namespace.u.pier) path.ae u.pacs)
     =.  ships.piers
-      (~(put by ships.piers) from.ae u.pier)
+      (~(put by ships.piers) ship.from.ae u.pier)
     $(cash pacs, thus this)
   ::
       %event

diff --git a/pkg/arvo/app/dbug.hoon b/pkg/arvo/app/dbug.hoon
@@ -628,6 +628,8 @@
     ::      duct: ['/paths', ...],
     ::      message-num: 123
     ::    }, ...],
+    ::    closing: [bone, ..., bone],
+    ::    corked: [bone, ..., bone],
     ::    heeds: [['/paths', ...] ...]
     ::    scries:
     ::    ->  { =path
@@ -706,8 +708,8 @@
           |^  =/  mix=(list flow)
                 =-  (sort - dor)
                 %+  welp
-                  (turn ~(tap by snd) (tack %snd))
-                (turn ~(tap by rcv) (tack %rcv))
+                  (turn ~(tap by snd) (tack %snd closing corked))
+                (turn ~(tap by rcv) (tack %rcv closing corked))
               =/  [forward=(list flow) backward=(list flow)]
                 %+  skid  mix
                 |=  [=bone *]
@@ -719,6 +721,8 @@
           ::
           +$  flow
             $:  =bone
+                closing=?
+                corked=?
               ::
                 $=  state
                 $%  [%snd message-pump-state]
@@ -727,17 +731,17 @@
             ==
           ::
           ++  tack
-            |*  =term
+            |*  [=term closing=(set bone) corked=(set bone)]
             |*  [=bone =noun]
-            [bone [term noun]]
+            [bone (~(has in closing) bone) (~(has in corked) bone) [term noun]]
           ::
           ++  build
             |=  flow
             ^-  json
             %+  frond  -.state
             ?-  -.state
-              %snd  (snd-with-bone ossuary bone +.state)
-              %rcv  (rcv-with-bone ossuary bone +.state)
+              %snd  (snd-with-bone ossuary bone closing corked +.state)
+              %rcv  (rcv-with-bone ossuary bone closing corked +.state)
             ==
           --
         ::
@@ -749,21 +753,27 @@
           :*  'message-num'^(numb message-num)
               (bone-to-pairs bone ossuary)
           ==
+        ::
+          'closing'^(set-array closing numb)
+        ::
+          'corked'^(set-array corked numb)
         ::
           'heeds'^(set-array heeds from-duct)
         ::
           'scries'^(scries ~(tap by keens))
       ==
     ::
     ++  snd-with-bone
-      |=  [=ossuary =bone message-pump-state]
+      |=  [=ossuary =bone closing=? corked=? message-pump-state]
       ^-  json
       %-  pairs
-      :*  'current'^(numb current)
+      :*  'closing'^b+closing
+          'corked'^b+corked
+          'current'^(numb current)
           'next'^(numb next)
         ::
           :-  'unsent-messages'  ::  as byte sizes
-          (set-array unsent-messages (cork (cury met 3) numb))
+          (set-array unsent-messages (cork jam (cork (cury met 3) numb)))
         ::
           'unsent-fragments'^(numb (lent unsent-fragments))  ::  as lent
         ::
@@ -811,10 +821,12 @@
       ==
     ::
     ++  rcv-with-bone
-      |=  [=ossuary =bone message-sink-state]
+      |=  [=ossuary =bone closing=? corked=? message-sink-state]
       ^-  json
       %-  pairs
-      :*  'last-acked'^(numb last-acked)
+      :*  'closing'^b+closing
+          'corked'^b+corked
+          'last-acked'^(numb last-acked)
           'last-heard'^(numb last-heard)
         ::
           :-  'pending-vane-ack'

diff --git a/pkg/arvo/app/debug/js/index.js b/pkg/arvo/app/debug/js/index.js
diff --git a/pkg/arvo/app/debug/js/tile.js b/pkg/arvo/app/debug/js/tile.js
diff --git a/pkg/arvo/app/dojo.hoon b/pkg/arvo/app/dojo.hoon
@@ -807,7 +807,7 @@
     ::
     ++  dy-run-generator
       !.
-      |=  [cay=cage cig=dojo-config]
+      |=  [cay=cage cig=dojo-config =desk]
       ^+  +>+>
       ?.  (~(nest ut [%cell [%atom %$ ~] %noun]) | p.q.cay)
         ::  naked generator; takes one argument
@@ -850,7 +850,7 @@
       |.  ^-  vase
       =/  gat=vase  (slot 3 q.cay)
       =/  som=vase  (slot 6 gat)
-      =/  ven=vase  !>([now=now.hid eny=eny.hid bec=he-beak])
+      =/  ven=vase  !>([now=now.hid eny=eny.hid bec=he-beak(q.dir desk)])
       =/  poz=vase  (dy-sore p.cig)
       =/  kev=vase
         =/  kuv=(unit vase)  (slew 7 som)
@@ -990,7 +990,7 @@
           %te  (dy-wool-poke p.bil q.bil)
           %ex  (dy-mere p.bil)
           %dv  (dy-sing hand+q.bil %a p.bil (snoc q.bil %hoon))
-          %ge  (dy-run-generator (dy-cage p.p.p.bil) q.p.bil)
+          %ge  (dy-run-generator (dy-cage p.p.p.bil) q.p.bil desk.q.p.p.bil)
           %sa
         =/  has-mark  .?((get-fit:clay he-beak %mar p.bil))
         ?.  has-mark

diff --git a/pkg/arvo/app/hood.hoon b/pkg/arvo/app/hood.hoon
@@ -2,8 +2,8 @@
 /+  drum=hood-drum, helm=hood-helm, kiln=hood-kiln
 |%
 +$  state
-  $~  [%26 *state:drum *state:helm *state:kiln]
-  $>(%26 any-state)
+  $~  [%27 *state:drum *state:helm *state:kiln]
+  $>(%27 any-state)
 ::
 +$  any-state
   $%  [ver=?(%1 %2 %3 %4 %5 %6) lac=(map @tas fin-any-state)]
@@ -27,6 +27,7 @@
       [%24 drum=state-4:drum helm=state-2:helm kiln=state-10:kiln]
       [%25 drum=state-5:drum helm=state-2:helm kiln=state-10:kiln]
       [%26 drum=state-6:drum helm=state-2:helm kiln=state-10:kiln]
+      [%27 drum=state-6:drum helm=state-2:helm kiln=state-11:kiln]
   ==
 +$  any-state-tuple
   $:  drum=any-state:drum