1
1
mirror of https://github.com/urbit/shrub.git synced 2024-12-27 06:02:27 +03:00
Commit Graph

38 Commits

Author SHA1 Message Date
jose
f158ebe312
Merge pull request from urbit/azimuth/jael-fix
jael: give new private key to subscribers on %keys new-event
2022-01-12 12:47:21 +01:00
yosoyubik
4724c32d3d pill: load azimuth snapshot file with mime mark 2021-12-14 09:40:34 +01:00
yosoyubik
f6dca03786 pill: restore solid pill 2021-12-10 16:19:59 +01:00
Jōshin
d94aa5704b
Merge branch 'master' into next/arvo
Conflicts:
	pkg/arvo/lib/azimuth.hoon

This file was turned into a symlink to pkg/base-dev/lib/azimuth.hoon on
one side of the fork, and meanwhile edited on the other side of the fork
(to update ecliptic to the new address for the WSTR fix.)

The two sides of the fork both had different outdated addresses in
base-dev's azimuth.hoon file, and Git's UI helpfully refilled the
contents of arvo's azimuth.hoon so that it showed a merge conflict with
an empty diff.

Resolved by reading out HEAD:pkg/arvo/lib/azimuth.hoon into
pkg/base-dev/lib/azimuth.hoon and manually recreating the symlink.
2021-12-10 08:24:32 +00:00
yosoyubik
fb2c078fde pill: load azimuth snapshot as mime in file-ovum 2021-12-09 07:28:57 +01:00
fang
35e820bfe6
Merge branch 'next/arvo' into m/shoe-scry 2021-12-08 13:13:54 +01:00
yosoyubik
81eb6ae247 pill: add azimuth snapshot 2021-12-07 16:13:39 +01:00
Yaseen
8819d61ff6 symlink arvo/lib/azimuth.hoon to base-dev/lib/azimuth.hoon 2021-11-19 12:33:12 -05:00
fang
0ec3d5111d
Merge branch 'master' into naive/roller 2021-10-26 20:46:32 +02:00
fang
5131d3165d
Merge branch 'release/next-userspace' into m/eip-1559-plus 2021-10-08 20:42:37 +04:00
ryjm
084f74129b spider, docket: fix versioning and validate-mark 2021-10-05 22:46:07 -04:00
Fang
f7c917600a
pill: do not include /tests in file-ovum 2021-09-29 22:12:20 +04:00
Liam Fitzgerald
d573687fd9 strandio: stop crashing on 504 2021-09-29 15:45:59 +10:00
Fang
526e60b04c
strandio: fail when http request gets cancelled
Instead of waiting for a proper response. Iris doesn't currently retry!

Also updates docket to detect this case and retry appropriately.
2021-09-28 20:51:51 +04:00
ryjm
47a6aa2753 spider garden: remove sigpams and move glob mark 2021-09-27 21:23:46 -04:00
ryjm
098587bf8b spider: fix mark validation
glob is succesfully downloaded and inserted into the docket state, but
as an octet stream. need to define the correct marks.
2021-09-27 21:23:46 -04:00
ryjm
035b29f0c0 spider: strand fixes 2021-09-27 21:23:46 -04:00
ryjm
121a7c9468 garden spider: add desk tracking 2021-09-27 21:23:46 -04:00
ryjm
c8cf0bb98d garden spider: (testing) correctly validate
just need to properly store the desk in `serving:spider` now.
2021-09-27 21:23:46 -04:00
ryjm
571649c631 spider: strand fixes 2021-09-27 21:23:46 -04:00
ryjm
a08c38b83c spider: track desks and validate marks (wip) 2021-09-27 21:23:46 -04:00
Hunter Miller
502f2e8a9c Merge branch 'hm/btc-wallet-conflict-resolution' into ea/master-dist-deconflict 2021-09-27 18:55:45 -05:00
Edward Amsden
02d2185eb3
move hoons to base-dev 2021-09-27 15:10:19 -04:00
Ted Blackman
bc7c2abe50 lib/pill: remove dead imports 2021-09-26 18:18:34 -04:00
Fang
da28fbfed9
Merge dist into m/distpilled 2021-09-20 19:35:51 +02:00
Liam Fitzgerald
143a8e08e6 various: fix dependencies & tests 2021-09-17 14:51:19 +10:00
Liam Fitzgerald
a433e4f911 Merge remote-tracking branch 'origin/dist' into lf/nu-hark-store 2021-09-14 12:40:52 +10:00
Ted Blackman
f58d115ce5 Merge remote-tracking branch 'ryjm/jm/ship-globs' into dist 2021-09-06 21:29:38 +03:00
Liam Fitzgerald
f24fbe3eba Merge remote-tracking branch 'origin/dist' into lf/nu-hark-store 2021-09-06 14:34:46 +10:00
Liam Fitzgerald
cb52de5c6c base-dev: update lib/agentio 2021-09-06 14:30:47 +10:00
Ted Blackman
f3e15396f3 %garden-dev desk; also cleaned up %base-dev 2021-09-02 00:37:56 +03:00
ryjm
ad8f6f681e docket: download globs over ames
Kind of a pain to test, need a better way to insert a `charge` directly.
Either that or rework `chad`, but I don't entirely understand why the
`chad` lifecycle is the way it is.
2021-09-01 02:22:54 -04:00
Liam Fitzgerald
17293ba758 treaty: fix updates after initial 2021-08-24 13:53:01 +10:00
Liam Fitzgerald
91276dd1c1 docket: revise $docket datastructures 2021-08-23 11:45:32 +10:00
Liam Fitzgerald
df47069a2f various: fixup missing 2021-08-11 14:40:25 +10:00
Liam Fitzgerald
6b59188642 base-dev: update missing libs 2021-08-11 14:15:40 +10:00
Liam Fitzgerald
41ae07f321 base-dev: add docket mark 2021-08-11 13:49:59 +10:00
Ted Blackman
f958b7874f various: fixes, pill might actually work now 2021-08-10 16:13:27 +03:00