Support wires in NockApps

apps/choo/README.md

@@ -56,3 +56,14 @@ runes:
 - `/=` load from specified path (required `%hoon` mark)
 - `/*` load from specified path via specified mark (presumptively `%hoon` or `%jock`)
 - `/?` version pinning (ignored)
+
+## Developer Troubleshooting
+
+If you make changes to the `poke` arm in `bootstrap/kernel.hoon` or in `hoon-deps/wrapper.hoon`, you'll need to update the `choo.jam` file by running:
+
+```bash
+cargo run --release bootstrap/kernel.hoon ../hoon-deps
+mv out.jam bootstrap/choo.jam
+```
+
+and committing the changes to `choo.jam` so that the CI can properly bootstrap the `choo` kernel.

apps/choo/bootstrap/kernel.hoon

@@ -87,7 +87,7 @@
 ::  +poke: external apply
 ::
 ++  poke
-  |=  [eny=@ our=@ux now=@da dat=*]
+  |=  [=wire eny=@ our=@ux now=@da dat=*]
   ^-  [(list effect) choo-state]
   =/  cause=(unit cause)  ((soft cause) dat)
   ?~  cause

apps/hoon-deps/lib/wrapper.hoon

@@ -40,7 +40,7 @@
       |~  arg=path
       *(unit (unit *))
     ++  poke
-      |~  arg=input
+      |~  arg=ovum
       [*(list *) *inner-state]
     --
   --
@@ -77,7 +77,7 @@
       =-  [effects ..poke]
       (slog tang.goof.u.g)
     ::
-        [[%poke ~] *]
+        [[%poke *] *]
       =/  ovum  ((soft ^ovum) ovum)
       ?~  ovum  ~&("invalid arg: {<ovum>}" ~^..poke)
       =/  o  ((soft input) input.u.ovum)
@@ -86,7 +86,7 @@
         =+  (road |.(;;(^^ovum ovum)))
         ~^..poke
       =^  effects  internal.outer
-        (poke:inner-fort input.u.ovum)
+        (poke:inner-fort u.ovum)
       [effects ..poke(internal.outer internal.outer)]
     ==
   --

apps/http-app/bootstrap/kernel.hoon

@@ -63,7 +63,7 @@
 ::  +poke: external apply
 ::
 ++  poke
-  |=  [eny=@ our=@ux now=@da dat=*]
+  |=  [=wire eny=@ our=@ux now=@da dat=*]
   ^-  [(list effect) server-state]
   =/  sof-cau=(unit cause)  ((soft cause) dat)
   ?~  sof-cau

apps/test-app/bootstrap/kernel.hoon

@@ -19,6 +19,7 @@
 ::
 ++  load
   |=  arg=test-state
+  ~&  >>  "load"
   arg
 ::
 ::  +peek: external inspect
@@ -38,8 +39,9 @@
 ::  +poke: external apply
 ::
 ++  poke
-  |=  [eny=@ our=@ux now=@da dat=*]
+  |=  [=wire eny=@ our=@ux now=@da dat=*]
   ^-  [(list effect) test-state]
+  ~&  >>  "poke: {<wire>}"
   =/  sof-cau=(unit cause)  ((soft cause) dat)
   ?~  sof-cau
     ~&  "cause incorrectly formatted!"

crown/src/drivers/file.rs

@@ -1,11 +1,40 @@
 use crate::nockapp::driver::{make_driver, IODriverFn};
+use crate::nockapp::wire::Wire;
 use crate::noun::slab::NounSlab;
 use crate::noun::FromAtom;
+use crate::utils::make_tas;
 use crate::AtomExt;
 use sword::noun::{IndirectAtom, Noun, D, T};
 use sword_macros::tas;
 use tracing::error;
 
+pub enum FileWire {
+    Read,
+    Write,
+}
+
+impl Wire for FileWire {
+    const VERSION: u64 = 1;
+    const SOURCE: &'static str = "file";
+
+    fn to_noun_slab(&self) -> NounSlab {
+        let mut slab = NounSlab::new();
+        let source = make_tas(&mut slab, FileWire::SOURCE).as_noun();
+        let wire = match self {
+            FileWire::Read => T(
+                &mut slab,
+                &[source, D(FileWire::VERSION), D(tas!(b"read")), D(0)],
+            ),
+            FileWire::Write => T(
+                &mut slab,
+                &[source, D(FileWire::VERSION), D(tas!(b"write")), D(0)],
+            ),
+        };
+        slab.set_root(wire);
+        slab
+    }
+}
+
 /// File IO Driver
 ///
 /// ## Effects
@@ -69,14 +98,16 @@ pub fn file() -> IODriverFn {
                                 &[D(tas!(b"file")), D(tas!(b"read")), D(0), contents_noun],
                             );
                             poke_slab.set_root(poke_noun);
-                            handle.poke(poke_slab).await?;
+                            let wire = FileWire::Read.to_noun_slab();
+                            handle.poke(wire, poke_slab).await?;
                         }
                         Err(_) => {
                             let mut poke_slab = NounSlab::new();
                             let poke_noun =
                                 T(&mut poke_slab, &[D(tas!(b"file")), D(tas!(b"read")), D(0)]);
                             poke_slab.set_root(poke_noun);
-                            handle.poke(poke_slab).await?;
+                            let wire = FileWire::Read.to_noun_slab();
+                            handle.poke(wire, poke_slab).await?;
                         }
                     }
                 }
@@ -106,7 +137,8 @@ pub fn file() -> IODriverFn {
                                 ],
                             );
                             poke_slab.set_root(poke_noun);
-                            handle.poke(poke_slab).await?;
+                            let wire = FileWire::Write.to_noun_slab();
+                            handle.poke(wire, poke_slab).await?;
                             continue;
                         }
                     }
@@ -125,7 +157,8 @@ pub fn file() -> IODriverFn {
                                 ],
                             );
                             poke_slab.set_root(poke_noun);
-                            handle.poke(poke_slab).await?;
+                            let wire = FileWire::Write.to_noun_slab();
+                            handle.poke(wire, poke_slab).await?;
                         }
                         Err(e) => {
                             error!("file driver: error writing to path: {}", e);
@@ -141,7 +174,8 @@ pub fn file() -> IODriverFn {
                                 ],
                             );
                             poke_slab.set_root(poke_noun);
-                            handle.poke(poke_slab).await?;
+                            let wire = FileWire::Write.to_noun_slab();
+                            handle.poke(wire, poke_slab).await?;
                         }
                     }
                 }

crown/src/drivers/http.rs

@@ -1,6 +1,8 @@
 use crate::nockapp::driver::{make_driver, IODriverFn, PokeResult};
+use crate::nockapp::wire::Wire;
 use crate::nockapp::NockAppError;
 use crate::noun::slab::NounSlab;
+use crate::utils::make_tas;
 use crate::{AtomExt, Bytes};
 use std::collections::HashMap;
 use std::sync::atomic::{AtomicU64, Ordering};
@@ -33,6 +35,25 @@ struct ResponseBuilder {
     body: Option<axum::body::Bytes>,
 }
 
+pub enum HttpWire {
+    Request,
+}
+
+impl Wire for HttpWire {
+    const VERSION: u64 = 1;
+    const SOURCE: &'static str = "http";
+
+    fn to_noun_slab(&self) -> NounSlab {
+        let mut slab = NounSlab::new();
+        let source = make_tas(&mut slab, HttpWire::SOURCE).as_noun();
+        let wire = match self {
+            HttpWire::Request => T(&mut slab, &[source, D(HttpWire::VERSION), D(tas!(b"req"))]),
+        };
+        slab.set_root(wire);
+        slab
+    }
+}
+
 static COUNTER: AtomicU64 = AtomicU64::new(0);
 // wraps on overflow
 fn get_id() -> u64 {
@@ -100,7 +121,8 @@ pub fn http() -> IODriverFn {
                     debug!("poking: {:?}", poke);
                     slab.set_root(poke);
 
-                    let poke_result = handle.poke(slab).await?;
+                    let wire = HttpWire::Request.to_noun_slab();
+                    let poke_result = handle.poke(wire, slab).await?;
                     debug!("poke result: {:?}", poke_result);
 
                     if let PokeResult::Nack = poke_result {