Merge remote-tracking branch 'origin/master' into release/next-sys

.github/workflows/build.yml

@@ -50,7 +50,7 @@ jobs:
       - uses: cachix/install-nix-action@v12
       - uses: cachix/cachix-action@v8
         with:
-          name: mars
+          name: ares
           authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
 
       - run: nix-build -A urbit --arg enableStatic true
@@ -73,7 +73,7 @@ jobs:
       - uses: cachix/install-nix-action@v12
       - uses: cachix/cachix-action@v8
         with:
-          name: mars
+          name: ares
           authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
 
       - run: nix-build -A hs.urbit-king.components.exes.urbit-king --arg enableStatic true

.github/workflows/release.yml

@@ -20,7 +20,7 @@ jobs:
       - uses: cachix/install-nix-action@v12
       - uses: cachix/cachix-action@v8
         with:
-          name: mars
+          name: ares
           authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
 
       - uses: google-github-actions/setup-gcloud@v0.2.0

README.md

@@ -36,7 +36,10 @@ If you're interested in Urbit development, keep reading.
 
 ## Development
 
-[![Build Status](https://travis-ci.org/urbit/urbit.svg?branch=master)][trav]
+[![License][license-badge]][license]
+[![Build][build-badge]][build]
+[![Nix][nix-badge]][nix]
+[![Cachix][cachix-badge]][cachix]
 
 Urbit uses [Nix][nix] to manage builds.  On Linux and macOS you can install Nix
 via:
@@ -45,6 +48,16 @@ via:
 curl -L https://nixos.org/nix/install | sh
 ```
 
+You can optionally setup Nix to pull build artefacts from the binary cache 
+that continuous integration uses. This will improve build times and avoid 
+unnecessary recompilations of common dependencies.  Once Nix has been installed 
+you can setup Cachix via:
+
+```
+nix-env -iA cachix -f https://cachix.org/api/v1/install
+cachix use ares
+```
+
 The Makefile in the project's root directory contains useful phony targets for
 building, installing, testing, and so on.  You can use it to avoid dealing with
 Nix explicitly.
@@ -69,8 +82,14 @@ git lfs install
 git lfs pull
 ```
 
-[trav]: https://github.com/urbit/urbit.git
-[nix]: https://nixos.org/nix/
+[license]: https://raw.githubusercontent.com/urbit/urbit/master/LICENSE.txt
+[license-badge]: https://img.shields.io/badge/license-MIT-blue.svg
+[build]: https://github.com/urbit/urbit/actions
+[build-badge]: https://github.com/urbit/urbit/workflows/build/badge.svg
+[cachix]: https://ares.cachix.org
+[cachix-badge]: https://img.shields.io/badge/cachix-ares-purple.svg
+[nix]: https://nixos.org
+[nix-badge]: https://img.shields.io/badge/builtwith-nix-purple.svg
 [git-lfs]: https://git-lfs.github.com
 
 ## Contributing
@@ -85,4 +104,4 @@ You might also be interested in joining the [urbit-dev][list] mailing list.
 
 [list]: https://groups.google.com/a/urbit.org/forum/#!forum/dev
 [cont]: https://github.com/urbit/urbit/blob/master/CONTRIBUTING.md
-[lcont]: https://github.com/urbit/urbit/blob/master/pkg/interface/CONTRIBUTING.md
+[lcont]: https://github.com/urbit/urbit/blob/master/pkg/interface/CONTRIBUTING.md

bin/solid.pill

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7fb70440761b73c2aa4a83e3f289e4b71875d8f9722f185baf059e4264826e42
-size 8129383
+oid sha256:9e169f1822997ece960527045b17790caf1490a79fd7bec86b0fb4c1eaf2cfc7
+size 8319616

default.nix

@@ -11,7 +11,7 @@
    Note that on linux the previous command is equivalent to:
 
      $ nix-build -A urbit --argstr crossSystem x86_64-unknown-linux-musl \
-                          --arg enableSatic true
+                          --arg enableStatic true
 
    Static urbit-king binary:
 

pkg/arvo/app/glob.hoon

@@ -5,7 +5,7 @@
 /-  glob
 /+  default-agent, verb, dbug
 |%
-++  hash  0vada5t.b1gqn.oo4ga.6o12h.ek1ot
+++  hash  0v5.bo337.25di9.mg5d5.i9vun.5qaqe
 +$  state-0  [%0 hash=@uv glob=(unit (each glob:glob tid=@ta))]
 +$  all-states
   $%  state-0

pkg/arvo/app/graph-pull-hook.hoon

@@ -22,16 +22,16 @@
     dep   ~(. (default:pull-hook this config) bowl)
     gra   ~(. graph bowl)
 ::
-++  on-init       on-init:def
-++  on-save       !>(~)
-++  on-load       on-load:def
-++  on-poke       on-poke:def
-++  on-peek       on-peek:def
-++  on-arvo       on-arvo:def
-++  on-fail       on-fail:def
-++  on-agent      on-agent:def
-++  on-watch      on-watch:def
-++  on-leave      on-leave:def
+++  on-init   on-init:def
+++  on-save   !>(~)
+++  on-load   on-load:def
+++  on-poke   on-poke:def
+++  on-peek   on-peek:def
+++  on-arvo   on-arvo:def
+++  on-fail   on-fail:def
+++  on-agent  on-agent:def
+++  on-watch  on-watch:def
+++  on-leave  on-leave:def
 ++  on-pull-nack
   |=  [=resource =tang]
   ^-  (quip card _this)

pkg/arvo/app/landscape/index.html

@@ -24,6 +24,6 @@
     <div id="portal-root"></div>
     <script src="/~landscape/js/channel.js"></script>
     <script src="/~landscape/js/session.js"></script>
-    <script src="/~landscape/js/bundle/index.9b0a67d07399229dd21d.js"></script>
+    <script src="/~landscape/js/bundle/index.794cd750ed8a20a02046.js"></script>
   </body>
 </html>

pkg/arvo/lib/push-hook.hoon

@@ -268,7 +268,6 @@
         %+  weld
           (push-updates:hc q.cage.sign)
         cards
-
       ==
       ++  on-leave
         |=  =path
@@ -374,6 +373,8 @@
     =/  prefix=path
       resource+(en-path:resource u.rid)
     =/  paths=(list path)
+      %~  tap  in
+      %-  silt
       %+  turn
         (incoming-subscriptions prefix)
       |=([ship pax=path] pax)

pkg/interface/dbug/src/js/views/ames.js

@@ -49,11 +49,16 @@ export class Ames extends Component {
     const unsent = snd['unsent-messages'].reduce((a, b) => {
       return a + b + ' bytes, ';
     }, 'unsent msg sizes: ');
-    const queuedAcks = snd['queued-message-acks'].map(qa => {
+
+    const quacks = snd['queued-message-acks'].map(qa => {
       return {key: qa['message-num'], jsx: (
         qa['message-num'] + ': ' + qa.ack
       )};
     });
+    const queuedAcks = (
+      <SearchableList placeholder="msg num" items={quacks} />
+    );
+
     const m = snd['packet-pump-state'].metrics;
     const pumpMetrics = (<>
       <table><tbody>

pkg/interface/src/views/apps/chat/ChatResource.tsx

@@ -38,8 +38,7 @@ export function ChatResource(props: ChatResourceProps) {
   const chatInput = useRef<ChatInput>();
 
   useEffect(() => {
-    const count = Math.min(150, unreadCount + 30);
-    console.log(`fetching ${count}`);
+    const count = Math.min(50, unreadCount + 15);
     props.api.graph.getNewest(owner, name, count);
   }, [station]);
 

pkg/interface/src/views/apps/chat/components/ChatWindow.tsx

@@ -199,14 +199,14 @@ export default class ChatWindow extends Component<ChatWindowProps, ChatWindowSta
     const currSize = graph.size;
     if(newer && !this.loadedNewest) {
       const [index] = graph.peekLargest()!;
-      await api.graph.getYoungerSiblings(ship,name, 100, `/${index.toString()}`)
+      await api.graph.getYoungerSiblings(ship,name, 20, `/${index.toString()}`)
       if(currSize === graph.size) {
         console.log('loaded all newest');
         this.loadedNewest = true;
       }
     } else if(!newer && !this.loadedOldest) {
       const [index] = graph.peekSmallest()!;
-      await api.graph.getOlderSiblings(ship,name, 100, `/${index.toString()}`)
+      await api.graph.getOlderSiblings(ship,name, 20, `/${index.toString()}`)
       this.calculateUnreadIndex();
       if(currSize === graph.size) {
         console.log('loaded all oldest');

pkg/interface/src/views/apps/notifications/inbox.tsx

@@ -1,7 +1,7 @@
 import React, { useEffect, useCallback } from "react";
 import f from "lodash/fp";
 import _ from "lodash";
-import { Icon, Col, Row, Box, Text, Anchor } from "@tlon/indigo-react";
+import { Icon, Col, Row, Box, Text, Anchor, Rule } from "@tlon/indigo-react";
 import moment from "moment";
 import { Notifications, Rolodex, Timebox, IndexedNotification, Groups } from "~/types";
 import { MOMENT_CALENDAR_DATE, daToUnix, resourceAsPath } from "~/logic/lib/util";
@@ -129,8 +129,10 @@ export default function Inbox(props: {
   };
 
   return (
-    <Col height="100%" overflowY="auto" onScroll={onScroll} >
-      {inviteItems(invites, api)}
+    <Col position="relative" height="100%" overflowY="auto" onScroll={onScroll} >
+      <Col zIndex={4} gapY={2} bg="white" top="0px" position="sticky">
+        {inviteItems(invites, api)}
+      </Col>
       {newNotifications && (
         <DaySection
           latest

pkg/interface/src/views/components/Invite.tsx

@@ -1,6 +1,6 @@
 import React, { Component } from 'react';
 import { Invite } from '~/types/invite-update';
-import { Text, Box, Button, Row } from '@tlon/indigo-react';
+import { Text, Box, Button, Row, Rule } from '@tlon/indigo-react';
 import { StatelessAsyncAction } from "~/views/components/StatelessAsyncAction";
 import { cite } from '~/logic/lib/util';
 
@@ -9,7 +9,8 @@ export class InviteItem extends Component<{invite: Invite, onAccept: (i: any) =>
     const { props } = this;
 
     return (
-      <Box width='100%' p='4' mb='4' borderBottom='1px solid lightGray' position='sticky' style={{ top: 0 }}>
+      <>
+      <Box width='100%' p='4'>
         <Box width='100%' verticalAlign='middle'>
           <Text display='block' pb='2' gray><Text mono>{cite(props.invite.resource.ship)}</Text> invited you to <Text fontWeight='500'>{props.invite.resource.name}</Text></Text>
         </Box>
@@ -34,6 +35,8 @@ export class InviteItem extends Component<{invite: Invite, onAccept: (i: any) =>
 
         </Row>
       </Box>
+      <Rule />
+      </>
     );
   }
 }