Merge branch 'master' into next/arvo

.github/workflows/frontend-test.yml

@@ -1,24 +0,0 @@
-name: frontend-test
-
-on:
-  pull_request:
-    paths:
-      - 'pkg/interface/**'
-      - 'pkg/btc-wallet/**'
-      - 'pkg/npm/**'
-
-jobs:
-  frontend-test:
-    runs-on: ubuntu-latest
-    name: "Test changed frontend packages"
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          fetch-depth: 0
-      - run: git fetch --prune
-      - name: 'Setup root deps'
-        run: npm ci
-      - name: 'Setup dependencies'
-        run: npm run bootstrap
-      - name: 'Run tests'
-        run: npm run test -- --since origin/$GITHUB_BASE_REF  --include-dependents

.github/workflows/vere.yml

@@ -162,86 +162,9 @@ jobs:
       - if: ${{ matrix.os == 'ubuntu-latest' }}
         run: nix-build -A docker-image
 
-  mingw:
-    runs-on: windows-latest
-    defaults:
-      run:
-        shell: >
-          C:\msys64\msys2_shell.cmd -mingw64 -defterm -no-start -here -c
-          ". <(cygpath '{0}')"
-        working-directory: ./pkg/urbit
-
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          lfs: true
-
-      # echo suppresses pacman prompt
-      - run: echo|./configure
-        env:
-          CACHIX_CACHE: ares
-          CACHIX_AUTH_TOKEN: ${{ secrets.CACHIX_AUTH_TOKEN }}
-
-      - run: mingw32-make build/urbit
-      - run: mingw32-make test
-      - run: >
-          build/urbit -l -d -B ../../bin/solid.pill -F bus &&
-          curl -f --data '{"source":{"dojo":"+hood/exit"},"sink":{"app":"hood"}}'
-          http://localhost:12321
-
-      - name: confirm binary is mostly static
-        run: |
-          if [ -z "$(ldd build/urbit | grep -vi "windows/system32")"]; then
-            echo "it's mostly static"
-            exit 0
-          else
-            echo "dynamic links found:"
-            ldd build/urbit
-            exit 1
-          fi
-
-      - uses: actions/setup-python@v2
-        if: inputs.upload
-        with:
-          python-version: 3.7
-
-      - uses: google-github-actions/setup-gcloud@v0.6.0
-        if: inputs.upload
-        env:
-          # see https://github.com/google-github-actions/setup-gcloud/issues/100
-          CLOUDSDK_PYTHON: ${{env.pythonLocation}}\python.exe
-        with:
-          service_account_key: ${{ secrets.GCS_SERVICE_ACCOUNT_KEY }}
-          project_id: ${{ secrets.GCS_PROJECT }}
-          export_default_credentials: true
-
-      - name: upload binary to bootstrap.urbit.org
-        if: inputs.upload
-        env:
-          CLOUDSDK_PYTHON: ${{env.pythonLocation}}\python.exe
-        shell: bash
-        run: |
-          if [ "real" == "$VERSION_TYPE" ]; then
-            version="$(cat ./version)"
-          else
-            version="${GITHUB_SHA:0:9}"
-          fi
-
-          system="x86_64-windows"
-          target="gs://${UPLOAD_BASE}/${VERE_PACE}/${version}/vere-v${version}-${system}.exe"
-
-          gsutil cp -n ./build/urbit.exe "$target"
-          exitcode=$?
-
-          test $exitcode -eq 0 &&
-            echo "upload to $target complete." ||
-            echo "upload to $target failed.";
-          exit $exitcode
-
-
   after:
     runs-on: ubuntu-latest
-    needs: [urbit, mingw]
+    needs: [urbit]
     if: inputs.upload
     steps:
       - uses: google-github-actions/setup-gcloud@v0.2.0

pkg/landscape/app/group-store.hoon

@@ -41,6 +41,7 @@
       state-one
       state-two
       state-three
+      state-four
   ==
 ::
 +$  state-zero
@@ -61,9 +62,15 @@
       =groups
       wait=(set ship)
   ==
+::
++$  state-four
+  $:  %4
+      =groups
+      wait=(set ship)
+  ==
 --
 ::
-=|  state-three
+=|  state-four
 =*  state  -
 ::
 %-  agent:dbug
@@ -84,7 +91,15 @@
     =|  cards=(list card)
     |^
     ?-    -.old
-        %3  [(flop cards) this(state old)]
+        %4  [(flop cards) this(state old)]
+    ::
+        %3 
+      %_    $
+          old    [%4 +.old] 
+          cards
+        :_  cards
+        [%pass /pyre/rebuild %agent [our dap]:bowl %poke noun+!>(%rebuild)]
+      ==
     ::
         %2
       %_    $
@@ -140,6 +155,7 @@
         ?+  q.vase  !!
           %migrate  poke-migrate:gc
           %export   poke-export:gc
+          %rebuild  poke-rebuild:gc
         ==
       ::
           ?(%group-update-0 %group-action)
@@ -235,6 +251,42 @@
 ::
 |_  bol=bowl:gall
 +*  io  ~(. agentio bol)
+++  poke-rebuild
+  ^-  (quip card _state)
+  |^  
+  =.  wait
+    put-missing
+  =^  cards  state
+    rewatch
+  [cards state]
+  ::
+  ++  rewatch
+    =/  wait  ~(tap in wait)
+    =|  cards=(list card)
+    |-
+    ?~  wait
+      [cards state]
+    =/  wir  /gladio/(scot %p i.wait)
+    =.  cards
+      :_(cards (watch-init-migrate i.wait))
+    ::  if we have a subscription already, leave first to restart
+    =?  cards
+        (~(has by wex.bol) [wir i.wait %groups])
+      :_(cards [%pass wir %agent [i.wait %groups] %leave ~])
+    $(wait t.wait)
+  ::
+  ++  put-missing
+    =/  wex  ~(tap by wex.bol)
+    |-
+    ?~  wex
+      wait
+    =/  [[=wire =ship =term] [acked=? =(pole knot)]]
+      i.wex
+    ?.  ?=([%gladio ship=@ ~] pole)
+      $(wex t.wex)
+    $(wex t.wex, wait (~(put in wait) (slav %p ship.pole)))
+  --
+::
 ++  poke-export
   ^-  (quip card _state)
   :_  state
@@ -351,8 +403,8 @@
   |=  arc=*
   ^-  (quip card _state)
   |^
-  =/  sty=state-three
-    [%3 (remake-groups ;;((tree [resource tree-group]) +.arc)) ~]
+  =/  sty=state-four
+    [%4 (remake-groups ;;((tree [resource tree-group]) +.arc)) ~]
   :_  sty
   %+  roll  ~(tap by groups.sty)
   |=  [[rid=resource grp=group] out=(list card)]

pkg/landscape/app/s3-store.hoon

@@ -9,12 +9,14 @@
 +$  card  card:agent:gall
 +$  versioned-state
   $%  state-zero
+      state-one
   ==
 ::
-+$  state-zero  [%0 =credentials =configuration]
++$  state-zero  [%0 =credentials:zero:past =configuration:zero:past]
++$  state-one   [%1 =credentials =configuration]
 --
 ::
-=|  state-zero
+=|  state-one
 =*  state  -
 ::
 %-  agent:dbug
@@ -28,8 +30,28 @@
 ++  on-init   on-init:def
 ++  on-save   !>(state)
 ++  on-load
-  |=  old-vase=vase
-  [~ this(state !<(state-zero old-vase))]
+  |=  =vase
+  =/  old  !<(versioned-state vase)
+  |^
+  ?-  -.old
+    %1  `this(state old)
+    %0  `this(state (state-0-to-1 old))
+  ==
+  ++  state-0-to-1
+    |=  zer=state-zero
+    ^-  state-one
+    :*  %1
+        credentials.zer
+        (configuration-0-to-1 configuration.zer)
+    ==
+  ++  configuration-0-to-1
+    |=  conf=configuration:zero:past
+    ^-  ^configuration
+    :*  buckets.conf
+        current-bucket.conf
+        ''
+    ==
+  --
 ::
 ++  on-poke
   ~/  %s3-poke
@@ -56,6 +78,9 @@
     ::
         %set-secret-access-key
       state(secret-access-key.credentials secret-access-key.act)
+    ::
+        %set-region
+      state(region.configuration region.act)
     ::
         %set-current-bucket
       %_  state

pkg/landscape/gen/s3-store/set-region.hoon

@@ -0,0 +1,10 @@
+::  s3-store|set-current-bucket: set current bucket for S3
+::
+/-  *s3
+:-  %say
+|=  $:  [now=@da eny=@uvJ =beak]
+        [[region=@t ~] ~]
+    ==
+:-  %s3-action
+^-  action
+[%set-region region]

pkg/landscape/lib/s3-json.hoon

@@ -10,6 +10,7 @@
     :~  [%set-endpoint so:dejs]
         [%set-access-key-id so:dejs]
         [%set-secret-access-key so:dejs]
+        [%set-region so:dejs]
         [%add-bucket so:dejs]
         [%remove-bucket so:dejs]
         [%set-current-bucket so:dejs]
@@ -25,6 +26,7 @@
   :~  ?-  -.upd
           %set-current-bucket  [%'setCurrentBucket' s+bucket.upd]
           %add-bucket          [%'addBucket' s+bucket.upd]
+          %set-region          [%'setRegion' s+region.upd]
           %remove-bucket       [%'removeBucket' s+bucket.upd]
           %set-endpoint        [%'setEndpoint' s+endpoint.upd]
           %set-access-key-id   [%'setAccessKeyId' s+access-key-id.upd]
@@ -44,6 +46,7 @@
         %-  pairs:enjs
         :~  [%buckets a+(turn ~(tap in buckets.configuration.upd) |=(a=@t s+a))]
             [%'currentBucket' s+current-bucket.configuration.upd]
+            [%'region' s+region.configuration.upd]
         ==
       ==
   ==

pkg/landscape/sur/s3-0.hoon

@@ -0,0 +1,27 @@
+|%
++$  credentials
+  $:  endpoint=@t
+      access-key-id=@t
+      secret-access-key=@t
+  ==
+::
++$  configuration
+  $:  buckets=(set @t)
+      current-bucket=@t
+  ==
+::
++$  action
+  $%  [%set-endpoint endpoint=@t]
+      [%set-access-key-id access-key-id=@t]
+      [%set-secret-access-key secret-access-key=@t]
+      [%add-bucket bucket=@t]
+      [%remove-bucket bucket=@t]
+      [%set-current-bucket bucket=@t]
+  ==
+::
++$  update
+  $%  [%credentials =credentials]
+      [%configuration =configuration]
+      action
+  ==
+--

pkg/landscape/sur/s3.hoon

@@ -1,4 +1,9 @@
+/-  zer=s3-0
 |%
+++  past
+  |%
+  ++  zero  zer
+  --
 +$  credentials
   $:  endpoint=@t
       access-key-id=@t
@@ -8,6 +13,7 @@
 +$  configuration
   $:  buckets=(set @t)
       current-bucket=@t
+      region=@t
   ==
 ::
 +$  action
@@ -17,6 +23,7 @@
       [%add-bucket bucket=@t]
       [%remove-bucket bucket=@t]
       [%set-current-bucket bucket=@t]
+      [%set-region region=@t]
   ==
 ::
 +$  update