Commit Graph

194 Commits

Author SHA1 Message Date
Liam Fitzgerald
2ca8f41288 metadata-store: add |remove generator 2020-10-19 12:45:20 +10:00
Philip Monk
77b33632a6
Merge remote-tracking branch 'origin/master' into release/next-sys 2020-10-14 19:26:33 -07:00
L
0d2a0bae14
Merge pull request #3632 from urbit/la/remove-hall-sur
acme: remove last %hall import and remove sur file
2020-10-13 15:05:37 -05:00
Fang
7242947f95
helm: add cors registry management generators 2020-10-05 23:42:59 +02:00
Logan Allen
e9f27a51fa acme: remove last %hall import and remove sur file 2020-10-01 21:49:16 -05:00
Fang
369193f50a
helm: add cors registry management generators 2020-09-30 15:54:25 +02:00
Ted Blackman
d6899857f4 +graph-store/import-graph 2020-09-18 16:50:34 -04:00
Ted Blackman
3c03d61038 +graph-store/export-graph and associated scry handler 2020-09-18 16:21:00 -04:00
Ted Blackman
f334854318 WIP: +graph-export 2020-09-18 15:50:54 -04:00
Joe Bryan
31fe240632 arvo: adds |meld, triggering memory unification 2020-09-09 22:50:43 -07:00
Joe Bryan
7f0b500778 arvo: adds |trim, triggering memory reclamation 2020-09-09 22:49:37 -07:00
Philip Monk
f9665c0cbd
Merge pull request #3378 from urbit/philip/base-hash
clay: expose mergebase as base-hash
2020-09-08 20:11:05 -07:00
Philip Monk
c7480c9b07
clay: fix bug in %mate
If both sides changed a file in the same way, %mate used the version in
the mergebase, which is incorrect.  This changes it to use the version
in the destination desk.

An example of this issue:

    > +cat %/test/hoon
    /~zod/home/~2020.9.3..21.41.24..61ed/test/hoon
    first

    > |merge %scratch our %home
    >=
    merged with strategy %fine
    + /~zod/scratch/2/test/hoon

    > +cat /=scratch=/test
    /~zod/scratch/~2020.9.3..21.41.32..408c/test/hoon
    first

    > *%/test/hoon 'second'
    : /~zod/home/3/test/hoon

    > *%%%/scratch=/test/hoon 'second'
    : /~zod/scratch/3/test/hoon

    > |merge %scratch our %home
    >=
    %fine merge failed, trying %meet
    %meet merge failed, trying %mate
    merged with strategy %mate
    : /~zod/scratch/4/test/hoon

    > +cat /=scratch=/test
    /~zod/scratch/~2020.9.3..21.42.25..9e8b/test/hoon
    first
2020-09-03 14:34:30 -07:00
Philip Monk
67c5caada8
clay: add safe merge options
As described in gen/hood/merge/help.txt
2020-08-28 16:36:00 -07:00
Philip Monk
794b31ec91
file-server: use new base hash 2020-08-25 21:08:26 -07:00
Philip Monk
4468d79509
clay: expose mergebase as base-hash
Change the definition of base-hash to be the mergebase of %home with the
OTA source.  This means it's the most recent successfully-applied
update, which is usually the most important information.

Add sour-hash, which is the hash of the most recently *downloaded*
update, regardless of whether it applied successfuly (ie the old
base-hash).

Add a summary of the various hashes at the top of gen/trouble.
2020-08-25 20:25:39 -07:00
Caio Marcelo de Oliveira Filho
92cf9d7c33 Merge branch 'master' into code-reset 2020-08-17 14:55:07 -07:00
Caio Marcelo de Oliveira Filho
df868e2c4f jael, eyre: Add a way to reset the web login code
Jael now stores a `step` that is combined with the original salt to
produce a new code.  A `%step` card is used to increment that value,
and effectively resetting the keys.  Because the first `step` is zero,
the first code is the same as before.

Eyre was changed to be notified with `%code-changed` so it can forget
old cookies, sessions and discard all the existing channels.

A new generator was added |code, that does both querying and
resetting the code

    |code             :: shows current code, step and help
    |code %reset      :: changes the code

The old +code generator still works correctly.
2020-07-31 11:35:48 -07:00
L
798f3b5de0
Merge pull request #3110 from urbit/la/graph-store
graph-store: a consistent, strongly validated, interoperable data storage format
2020-07-30 15:25:17 -07:00
Logan Allen
043714752e hood: no longer start graph hooks for now 2020-07-28 12:21:30 -07:00
Logan Allen
452d6ea4e1 graph-store: fully tested mark validation system 2020-07-28 12:03:09 -07:00
Logan Allen
a35749e2be graph-store: first validator mark builds 2020-07-27 12:56:30 -07:00
Logan Allen
325667f9ec Merge branch 'master' into la/graph-store 2020-07-27 12:10:22 -07:00
Logan Allen
a3cc668392 gen: add-graph uses empty graph 2020-07-27 12:09:19 -07:00
Fang
3315be4a24
Merge pull request #3197 from urbit/m/spur-timers
gen: use spur in +timers
2020-07-27 20:33:10 +02:00
Fang
89d8abf765
gen: use spur in +timers
+en-beam expects a spur, reversing it for the final path rendering.
2020-07-27 19:48:26 +02:00
Matilde Park
75acc5aeb5 Merge branch 'master' into release/next-userspace 2020-07-24 17:34:09 -04:00
Philip Monk
3a489e2f6f
Merge pull request #3156 from urbit/philip/moon
moon: print key with correct life
2020-07-24 14:13:57 -07:00
Joe Bryan
9e77535568 Merge branch 'master' into release/next-vere
* master: (117 commits)
  contact-store: restore /~/default contacts
  contact-hook: resubscribe on correct paths
  metadata: handle OTA correctly
  release: urbit-os-v1.0.30
  group-store: remove scries from OTA logic
  release: urbit-os-v1.0.30
  MAINTAINERS: amend for post-fusion
  ames: add scry endpoint for forward lanes
  ames: improve scry interface
  chat, publish, contacts: fix OTA bugs
  trouble: report glob state
  clay: ignore extraneous /sys/lyv results
  zuse: added docstring and warning
  release: urbit-os-v1.0.29
  groups: correct line-height on group items
  launch: use mono for base hash
  interface: don't require urbitrc for build:prod
  maintainers: add glob-making instructions
  interface: amend disconnect copy
  metadata-store: migrate contact paths
  ...
2020-07-23 16:08:09 -07:00
Philip Monk
d44661e5e6
moon: print key with correct life
We were sending the correct life to Jael, but the ticket we printed had
the life hardcoded to 1.  This makes it use the correct life in both
places.
2020-07-23 01:47:02 -07:00
Caio Marcelo de Oliveira Filho
47871d0f48 ota: show information instead of disable by default
Instead of `|ota` cancel the OTA, make it show the current setting.
Make the cancel need a more explicit argument.

   |ota                 shows the current setting
   |ota disable         disable OTA
   |ota ~sponsor %desk  reset to a different sponsor/desk

Because most of the time the expected desk is going to be %kids, use
that in the "help message".
2020-07-22 16:27:05 -07:00
Logan Allen
9d5f16901e graph-store: update generators 2020-07-22 13:33:05 -07:00
Matilde Park
0d68f3f901 Merge branch 'release/next-sys' 2020-07-22 14:31:17 -04:00
Liam Fitzgerald
24b25a3422 Merge remote-tracking branch 'origin/release/next-userspace' into lf/groups-refactor 2020-07-22 10:42:52 +00:00
Caio Marcelo de Oliveira Filho
d8203eb0d1 trouble: report glob state 2020-07-22 00:22:45 -07:00
Fang
3eab480de7
Merge branch 'release/next-sys' into jb/m/behn-scry 2020-07-22 02:02:05 +02:00
Philip Monk
350756b47a
glob: autostart and make ota-able 2020-07-17 16:58:28 -07:00
Logan Allen
106119a9ba Merge branch 'la/ordered-map-subset' into la/graph-store 2020-07-08 15:17:55 -04:00
Liam Fitzgerald
76bc3d82e1 Merge branch 'release/next-userspace' into lf/groups-refactor 2020-07-08 10:04:02 +10:00
Logan Allen
a7cbecc0e2 Merge branch 'lf/groups-refactor' into la/graph-store 2020-07-06 15:02:20 -04:00
Fang
a53e462be8
Merge branch 'master' into ipc-redux 2020-07-03 14:58:49 +02:00
Philip Monk
ba9e894580
trouble: report source of OTA instead of parent 2020-06-30 16:10:12 -07:00
Liam Fitzgerald
9b61c5571b Merge branch 'ford-fusion' into lf/groups-refactor 2020-06-27 10:42:16 +10:00
Joe Bryan
7f61b5a491 Revert "Merge pull request #3050 from urbit/m/behn-improvements"
This reverts commit ed808614aa, reversing
changes made to a6db3add83.
2020-06-26 16:24:43 -07:00
Fang
fe87d69ad1 behn: improve scry interface
No longer abuse the desk field, instead making use of the path. Reject
any scries outside of the local ship, empty desk and current time as
invalid.

Expose ducts only under a debug endpoint, nothing else should care about
being able to inspect them.

Add scry endpoints for the very next timer (if any), and all timers up
to and including a specified timestamp.
2020-06-26 15:17:12 -07:00
Liam Fitzgerald
ad6efe44ff groups: update generators and marks for ford-fusion 2020-06-26 12:45:02 +10:00
Ted Blackman
26ff47b93d Merge remote-tracking branch 'origin/release/next-userspace' into ford-fusion 2020-06-25 22:24:30 -04:00
Fang
a94285208a
behn: improve scry interface
No longer abuse the desk field, instead making use of the path. Reject
any scries outside of the local ship, empty desk and current time as
invalid.

Expose ducts only under a debug endpoint, nothing else should care about
being able to inspect them.

Add scry endpoints for the very next timer (if any), and all timers up
to and including a specified timestamp.
2020-06-24 17:09:29 +02:00
Logan Allen
a245a1b095 graph-store: added archiving functionality 2020-06-23 14:01:04 -04:00
Logan Allen
c9ccbdabef graph-store: added action generators 2020-06-23 14:00:15 -04:00