Merge remote-tracking branch 'origin/develop' into release

.github/CODEOWNERS

@@ -0,0 +1,14 @@
+# For more information on how CODEOWNERS work, see
+# https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-code-owners.
+
+# Default owner for everything in the repo. Matches farther down in the file
+# will override this default.
+* @urbit/runtime
+
+# Build system
+/.github/ @mcevoypeter
+/bazel/   @mcevoypeter
+*.bazel   @mcevoypeter
+*.bzl     @mcevoypeter
+/PACE     @mcevoypeter
+/VERSION  @mcevoypeter

.github/workflows/once.yml

@@ -0,0 +1,12 @@
+name: Deploy once
+
+on:
+  workflow_dispatch
+
+jobs:
+  urbit:
+    uses: ./.github/workflows/shared.yml
+    with:
+      pace: 'once'
+      upload: true
+    secrets: inherit

.github/workflows/shared.yml

@@ -85,7 +85,7 @@ jobs:
             "macos-x86_64")
               # Switch Xcode path to match the path specified in our bazel toolchain.
               sudo xcode-select --switch /Library/Developer/CommandLineTools
-              brew install automake libtool
+              brew install automake libtool llvm@15
               ;;
             *)
               echo "Unsupported target: ${{ matrix.target }}"
@@ -108,7 +108,7 @@ jobs:
               bazel build :urbit
               ;;
             "macos-x86_64")
-              bazel build --clang_version=14.0.6 --extra_toolchains=//bazel/toolchain:brew-clang-macos-x86_64-toolchain :urbit
+              bazel build --clang_version=15.0.7 --extra_toolchains=//bazel/toolchain:brew-clang-macos-x86_64-toolchain :urbit
               ;;
           esac
 

VERSION

@@ -1 +1 @@
-1.17
+1.18

WORKSPACE.bazel

@@ -209,9 +209,9 @@ versioned_http_file(
 
 versioned_http_file(
     name = "solid_pill",
-    sha256 = "d737f88463f683173b5f6cbf41fc38705d4d3d67263c675d7e99841cd8485d81",
+    sha256 = "8b658fcee6978e2b19004a54233cab953e77ea0bb6c3a04d1bfda4ddc6be63c5",
     url = "https://github.com/urbit/urbit/raw/{version}/bin/solid.pill",
-    version = "next/vere",
+    version = "255fb1ca8206072f1d09425f0db61ecfe7ff5b17",
 )
 
 versioned_http_archive(
@@ -316,11 +316,11 @@ versioned_http_archive(
 
 versioned_http_file(
     name = "urbit",
-    sha256 = "403a2691dcc0cbff60157e3f91ffe15f4c8bc9dd5e1acab1d438b84cc8ef7711",
+    sha256 = "a729d8b3c438fef33f5ae8c4da8d84ebdb5af5ad028d41696a92cddc8bf362a8",
     url = "https://github.com/urbit/urbit/archive/{version}.tar.gz",
     # We can't use a branch name for the `version` because each new commit
     # will change the SHA256 hash.
-    version = "39a104f872736c3b0b879d592302b86a67ad078b",
+    version = "ea8fee3aa0434d4bdf1bf785e5ec346c7ecba7fd",
 )
 
 versioned_http_archive(

bazel/toolchain/BUILD.bazel

@@ -285,12 +285,12 @@ cc_toolchain_config(
     # and corresponding `ar_flags_feature` in `cfg.bzl`.
     # See https://github.com/bazelbuild/bazel/issues/15875.
     ar_flags = "rcs",
-    cc = "/usr/local/opt/llvm@14/bin/clang",
+    cc = "/usr/local/opt/llvm@15/bin/clang",
     compiler = "clang",
     compiler_version = "//:clang_version",
     ld = "/usr/bin/ld",
     sys_includes = [
-        "/usr/local/Cellar/llvm@14/{compiler_version}/lib/clang/{compiler_version}/include",
+        "/usr/local/Cellar/llvm/15.0.7_1/lib/clang/15.0.7/include",
         "/Library/Developer/CommandLineTools/SDKs/MacOSX12.sdk/usr/include",
     ],
     target_cpu = "x86_64",

pkg/noun/jets/d/in_apt.c

@@ -6,7 +6,7 @@
 #include "noun.h"
 
 static c3_o
-_in_apt(u3_noun a, u3_weak l, u3_weak r)
+_in_apt_140(u3_noun a, u3_weak l, u3_weak r)
 {
   if ( u3_nul == a ) {
     return c3y;
@@ -28,12 +28,75 @@ _in_apt(u3_noun a, u3_weak l, u3_weak r)
         return c3n;
       }
 
+      if ( c3n == _in_apt_140(l_a, n_a, r) ) {
+        return c3n;
+      }
+    }
+
+    if ( u3_nul != r_a ) {
+      if ( c3n == u3qc_mor(n_a, u3h(r_a)) ) {
+        return c3n;
+      }
+
+      return _in_apt_140(r_a, l, n_a);
+    }
+
+    return c3y;
+  }
+}
+
+u3_noun
+u3qdi_apt_140(u3_noun a)
+{
+  return _in_apt_140(a, u3_none, u3_none);
+}
+
+u3_noun
+u3wdi_apt_140(u3_noun cor)
+{
+  return u3qdi_apt_140(u3x_at(u3x_con_sam, cor));
+}
+
+
+static c3_o
+_in_apt(u3_noun a, u3_weak l, u3_weak r)
+{
+  if ( u3_nul == a ) {
+    return c3y;
+  }
+  else {
+    u3_noun n_a, l_a, r_a;
+    u3x_trel(a, &n_a, &l_a, &r_a);
+
+    if ( (u3_none != l) &&
+         ( (c3y == u3r_sing(n_a, l)) || (c3n == u3qc_gor(n_a, l)) )) {
+      return c3n;
+    }
+
+    if ( (u3_none != r) &&
+         ( (c3y == u3r_sing(r, n_a)) || (c3n == u3qc_gor(r, n_a)) )) {
+      return c3n;
+    }
+
+    if ( u3_nul != l_a ) {
+      if ( c3y == u3r_sing(n_a, u3h(l_a)) ) {
+        return c3n;
+      }
+
+      if ( c3n == u3qc_mor(n_a, u3h(l_a)) ) {
+        return c3n;
+      }
+
       if ( c3n == _in_apt(l_a, n_a, r) ) {
         return c3n;
       }
     }
 
     if ( u3_nul != r_a ) {
+      if ( c3y == u3r_sing(n_a, u3h(r_a)) ) {
+        return c3n;
+      }
+
       if ( c3n == u3qc_mor(n_a, u3h(r_a)) ) {
         return c3n;
       }

pkg/noun/jets/tree.c

@@ -1,6 +1,8 @@
 /// @file
 
 /*
+  These hashes are deprecated, you should instead use no_hashes.
+
   To generate the hashes, take the sha256 of the jammed battery. For example:
 
   ```
@@ -1734,7 +1736,7 @@ static c3_c* _140_two_xeb_ha[] = {
   0
 };
 
-  static u3j_harm _140_two__in_apt_a[] = {{".2", u3wdi_apt}, {}};
+  static u3j_harm _140_two__in_apt_a[] = {{".2", u3wdi_apt_140}, {}};
   static c3_c* _140_two__in_apt_ha[] = {
     "a40812fa255f13afdaf196bff38d2d9bfcb38f09c48ace9139a2701a555a0c9a",
     0
@@ -2139,6 +2141,110 @@ static c3_c* _k140_ha[] = {
   0
 };
 
+static u3j_harm _139_two__in_apt_a[] = {{".2", u3wdi_apt}, {}};
+
+static u3j_core _139_two__in_d[] =
+  { { "apt", 7, _139_two__in_apt_a, 0, no_hashes },
+    { "bif", 7, _140_two__in_bif_a, 0, no_hashes },
+    { "del", 7, _140_two__in_del_a, 0, no_hashes },
+    { "dif", 7, _140_two__in_dif_a, 0, no_hashes },
+    { "gas", 7, _140_two__in_gas_a, 0, no_hashes },
+    { "has", 7, _140_two__in_has_a, 0, no_hashes },
+    { "int", 7, _140_two__in_int_a, 0, no_hashes },
+    { "put", 7, _140_two__in_put_a, 0, no_hashes },
+    { "rep", 7, _140_two__in_rep_a, 0, no_hashes },
+    { "run", 7, _140_two__in_run_a, 0, no_hashes },
+    { "tap", 7, _140_two__in_tap_a, 0, no_hashes },
+    { "uni", 7, _140_two__in_uni_a, 0, no_hashes },
+    { "wyt", 3, _140_two__in_wyt_a, 0, no_hashes },
+    {}
+  };
+
+static u3j_core _139_two_d[] =
+{ { "tri",  3, 0, _140_tri_d, no_hashes, _140_tri_ho },
+
+  { "find", 7, _140_two_find_a, 0, no_hashes },
+  { "flop", 7, _140_two_flop_a, 0, no_hashes },
+  { "lent", 7, _140_two_lent_a, 0, no_hashes },
+  { "levy", 7, _140_two_levy_a, 0, no_hashes },
+  { "lien", 7, _140_two_lien_a, 0, no_hashes },
+  { "murn", 7, _140_two_murn_a, 0, no_hashes },
+  { "need", 7, _140_two_need_a, 0, no_hashes },
+  { "reap", 7, _140_two_reap_a, 0, no_hashes },
+  { "reel", 7, _140_two_reel_a, 0, no_hashes },
+  { "roll", 7, _140_two_roll_a, 0, no_hashes },
+  { "skid", 7, _140_two_skid_a, 0, no_hashes },
+  { "skim", 7, _140_two_skim_a, 0, no_hashes },
+  { "skip", 7, _140_two_skip_a, 0, no_hashes },
+  { "scag", 7, _140_two_scag_a, 0, no_hashes },
+  { "slag", 7, _140_two_slag_a, 0, no_hashes },
+  { "snag", 7, _140_two_snag_a, 0, no_hashes },
+  { "sort", 7, _140_two_sort_a, 0, no_hashes },
+  { "turn", 7, _140_two_turn_a, 0, no_hashes },
+  { "weld", 7, _140_two_weld_a, 0, no_hashes },
+  { "welp", 7, _140_two_welp_a, 0, no_hashes },
+  { "zing", 7, _140_two_zing_a, 0, no_hashes },
+
+  { "bex", 7, _140_two_bex_a, 0, no_hashes },
+  { "cat", 7, _140_two_cat_a, 0, no_hashes },
+  { "can", 7, _140_two_can_a, 0, no_hashes },
+  { "con", 7, _140_two_con_a, 0, no_hashes },
+  { "cue", 7, _140_two_cue_a, 0, no_hashes },
+  { "cut", 7, _140_two_cut_a, 0, no_hashes },
+  { "dis", 7, _140_two_dis_a, 0, no_hashes },
+  { "dor", 7, _140_two_dor_a, 0, no_hashes },
+  { "end", 7, _140_two_end_a, 0, no_hashes },
+  { "gor", 7, _140_two_gor_a, 0, no_hashes },
+  { "jam", 7, _140_two_jam_a, 0, no_hashes },
+  { "lsh", 7, _140_two_lsh_a, 0, no_hashes },
+  { "mat", 7, _140_two_mat_a, 0, no_hashes },
+  { "met", 7, _140_two_met_a, 0, no_hashes },
+  { "mix", 7, _140_two_mix_a, 0, no_hashes },
+  { "mor", 7, _140_two_mor_a, 0, no_hashes },
+  { "mug", 7, _140_two_mug_a, 0, no_hashes },
+  { "muk", 59, _140_two_muk_a, 0, no_hashes },
+  { "rap", 7, _140_two_rap_a, 0, no_hashes },
+  { "rep", 7, _140_two_rep_a, 0, no_hashes },
+  { "rev", 7, _140_two_rev_a, 0, no_hashes },
+  { "rip", 7, _140_two_rip_a, 0, no_hashes },
+  { "rsh", 7, _140_two_rsh_a, 0, no_hashes },
+  { "swp", 7, _140_two_swp_a, 0, no_hashes },
+  { "rub", 7, _140_two_rub_a, 0, no_hashes },
+  { "pow", 7, _140_two_pow_a, 0, no_hashes },
+  { "sqt", 7, _140_two_sqt_a, 0, no_hashes },
+  { "xeb", 7, _140_two_xeb_a, 0, no_hashes },
+
+  { "by",  7, 0, _140_two__by_d, no_hashes },
+  { "in",  7, 0, _139_two__in_d, no_hashes },
+  {}
+};
+
+static u3j_core _139_one_d[] =
+{ { "two", 3, 0, _139_two_d, no_hashes },
+
+  { "add", 7, _140_one_add_a, 0, no_hashes },
+  { "dec", 7, _140_one_dec_a, 0, no_hashes },
+  { "div", 7, _140_one_div_a, 0, no_hashes },
+  { "dvr", 7, _140_one_dvr_a, 0, no_hashes },
+  { "gte", 7, _140_one_gte_a, 0, no_hashes },
+  { "gth", 7, _140_one_gth_a, 0, no_hashes },
+  { "lte", 7, _140_one_lte_a, 0, no_hashes },
+  { "lth", 7, _140_one_lth_a, 0, no_hashes },
+  { "mod", 7, _140_one_mod_a, 0, no_hashes },
+  { "mul", 7, _140_one_mul_a, 0, no_hashes },
+  { "sub", 7, _140_one_sub_a, 0, no_hashes },
+
+  { "cap", 7, _140_one_cap_a, 0, no_hashes },
+  { "mas", 7, _140_one_mas_a, 0, no_hashes },
+  { "peg", 7, _140_one_peg_a, 0, no_hashes },
+  {}
+};
+
+u3j_core _k139_d[] =
+{ { "one", 3, 0, _139_one_d, no_hashes },
+  {}
+};
+
 
 //  TODO: probably need different ha hashes
 
@@ -2152,7 +2258,7 @@ static u3j_core _a50_two__by_d[] =
   };
 
 static u3j_core _a50_two__in_d[] =
-  { { "apt", 7, _140_two__in_apt_a, 0, _140_two__in_apt_ha },
+  { { "apt", 7, _140_two__in_apt_a, 0, _140_two__in_apt_ha },  // NB: 140 jet
     { "del", 7, _140_two__in_del_a, 0, _140_two__in_del_ha },
     { "put", 7, _140_two__in_put_a, 0, _140_two__in_put_ha },
     {}
@@ -2207,6 +2313,7 @@ u3j_core _a50_d[] =
 
 static u3j_core _d[] = {
   { "k140", 0, 0, _k140_d, _k140_ha, 0, (u3j_core*) 140, 0 },
+  { "k139", 0, 0, _k139_d, no_hashes, 0, (u3j_core*) 139, 0 },
   { "a50", 0, 0, _a50_d, _k140_ha, 0, (u3j_core*) c3__a50, 0 },
   {}
 };

pkg/noun/jets/w.h

@@ -103,6 +103,7 @@
     u3_noun u3wdb_run(u3_noun);
 #   define u3wdb_wyt u3wdi_wyt
 
+    u3_noun u3wdi_apt_140(u3_noun);
     u3_noun u3wdi_apt(u3_noun);
     u3_noun u3wdi_bif(u3_noun);
     u3_noun u3wdi_del(u3_noun);

pkg/vere/BUILD.bazel

@@ -262,6 +262,7 @@ genrule(
 
     mkdir ./urbit
     tar xfz $(execpath @urbit//file) -C ./urbit --strip-components=1
+    cp -RL ./urbit/tests ./urbit/pkg/arvo/tests
 
     $(execpath :urbit) --lite-boot --daemon --fake bus \
       --bootstrap $(execpath @solid_pill//file)        \

pkg/vere/pier.c

@@ -674,8 +674,8 @@ _pier_wyrd_fail(u3_pier* pir_u, u3_ovum* egg_u, u3_noun lud)
 //  XX organizing version constants
 //
 #define VERE_NAME  "vere"
-#define VERE_ZUSE  416
-#define VERE_LULL  327
+#define VERE_ZUSE  415
+#define VERE_LULL  326
 
 /* _pier_wyrd_aver(): check for %wend effect and version downgrade. RETAIN
 */
@@ -812,8 +812,8 @@ _pier_wyrd_card(u3_pier* pir_u)
                      u3_nul);
   u3_noun kel = u3nl(u3nc(c3__zuse, VERE_ZUSE),  //  XX from both king and serf?
                      u3nc(c3__lull, VERE_LULL),  //  XX from both king and serf?
-                     u3nc(c3__arvo, 240),        //  XX from both king and serf?
-                     u3nc(c3__hoon, 140),        //  god_u->hon_y
+                     u3nc(c3__arvo, 239),        //  XX from both king and serf?
+                     u3nc(c3__hoon, 139),        //  god_u->hon_y
                      u3nc(c3__nock, 4),          //  god_u->noc_y
                      u3_none);
   u3_noun wir = u3nc(c3__arvo, u3_nul);
@@ -2349,7 +2349,7 @@ u3_pier_tank(c3_l tab_l, c3_w pri_w, u3_noun tac)
         case 3: fprintf(fil_u, "\033[31m>>> "); break;
         case 2: fprintf(fil_u, "\033[33m>>  "); break;
         case 1: fprintf(fil_u, "\033[32m>   "); break;
-        case 0: fprintf(fil_u, "\033[90m"    ); break;
+        case 0: fprintf(fil_u, "\033[38;5;244m"); break;
     }
   }
   else {

pkg/vere/serf.c

@@ -1103,7 +1103,7 @@ u3_serf_init(u3_serf* sef_u)
 
   {
     c3_w  pro_w = 1;
-    c3_y  hon_y = 141;
+    c3_y  hon_y = 139;
     c3_y  noc_y = 4;
     u3_noun ver = u3nt(pro_w, hon_y, noc_y);