Commit Graph

17241 Commits

Author SHA1 Message Date
Jared Tobin
9c1d3090c9
Merge branch 'lukechampine/crypto-tests' (#2222)
* lukechampine/crypto-tests:
  test: add bip32 vectors
  test: add scrypt vectors
  test: add hmac vectors
  test: add ed25519 vectors
  test: add expect arm
  test: add AES SIV mode vectors
  zuse: split sivb keys at correct offset
  test: add AES-CMAC vectors
  test: add AES CTR mode vectors
  test: add AES CBC mode vectors
  test: add AES ECB mode vectors
2020-02-29 19:39:35 +04:00
Jared Tobin
bd2d90440f
Merge branch 'ted/ford-no-pit' (#2322)
* origin/ted/ford-no-pit:
  pills: update solid
  http.c: revert timeout to original ~m10
  tests: prime ford %reef cache
  http.c: bump timeout from ~m20 to ~m30
  http.c: bump timeout from ~m10 to ~m20
  tests: fix ford tests for no %reef short-circuit
  ford: remove pit short-circuit
2020-02-28 20:48:24 +04:00
lukechampine
f214ac8191 test: add bip32 vectors 2020-02-28 11:47:43 -05:00
lukechampine
0688c31d8a test: add scrypt vectors 2020-02-28 11:47:43 -05:00
lukechampine
58cdceafd6 test: add hmac vectors 2020-02-28 11:47:43 -05:00
lukechampine
b300a97ca4 test: add ed25519 vectors 2020-02-28 11:47:43 -05:00
Jared Tobin
d4225848be
pills: update solid 2020-02-28 20:31:32 +04:00
Jared Tobin
046506f9d4
Merge branch 'liam-fitzgerald/hoon-spot' (#2247)
* liam-fitzgerald/hoon-spot:
  hoon: toggle spot typehints on flag
  hoon: support %spot hint in xray
  hoon: add %spot typehint

Signed-off-by: Jared Tobin <jared@tlon.io>
2020-02-28 20:02:39 +04:00
Jared Tobin
6ef08962ef
Merge branch 'joemfb/cache-skip-pr' (#2363)
* joemfb/cache-skip-pr:
  ci: skip cachix push if env is not set and in a pr build

Signed-off-by: Jared Tobin <jared@tlon.io>
2020-02-27 20:04:30 +04:00
Joe Bryan
871828ee66 ci: skip cachix push if env is not set and in a pr build 2020-02-26 17:44:13 -08:00
Ted Blackman
17a621e8e7 http.c: revert timeout to original ~m10 2020-02-26 15:43:46 -05:00
Jared Tobin
686aaa565e
Merge branch 'ixv/publish-invitatory' (#2351)
* origin/ixv/publish-invitatory:
  publish: add publish invite path

Signed-off-by: Jared Tobin <jared@tlon.io>
2020-02-26 11:11:10 +04:00
Liam Fitzgerald
8c6ae6f917 Merge branch 'master' into hoon-spot 2020-02-26 09:29:54 +10:00
Liam Fitzgerald
df51577022 hoon: toggle spot typehints on flag
Hides %spot typehints behind a compiler flag. Adds ++mind:ut to
expose this flag conveniently.
2020-02-26 08:07:02 +10:00
Isaac Visintainer
9581a0535c publish: add publish invite path 2020-02-25 13:43:06 -08:00
Ted Blackman
44b3c9b2a3 tests: prime ford %reef cache 2020-02-25 15:53:08 -05:00
Ted Blackman
3d6f1b565f http.c: bump timeout from ~m20 to ~m30 2020-02-25 13:14:41 -05:00
Ted Blackman
3c54e61a04 http.c: bump timeout from ~m10 to ~m20 2020-02-25 04:44:51 -05:00
Ted Blackman
af04767dfe tests: fix ford tests for no %reef short-circuit 2020-02-24 18:11:47 -05:00
Jared Tobin
024908dd6a
Merge branch 'm/dbug-default' (#2343)
* origin/m/dbug-default:
  dbug: default to %state

Signed-off-by: Jared Tobin <jared@tlon.io>
2020-02-24 13:44:10 +04:00
Jared Tobin
24ec14d53f
Merge branch 'm/permission-hook-state-hygiene' (#2335)
* origin/m/permission-hook-state-hygiene:
  permission-hook: clean up access-control on %delete

Signed-off-by: Jared Tobin <jared@tlon.io>
2020-02-24 13:43:57 +04:00
Fang
a61718fd51
dbug: default to %state 2020-02-23 01:46:26 +01:00
Fang
d80b5d24bc
permission-hook: clean up access-control on %delete
If we %add-owned, then we add an entry to the access-control jug matching the
data we put into the synced map. When a permission gets deleted, we remove it
from synced, but previously neglected to clean up the matching access-control
entry.

This ensures that if a permission was deleted, and we had it registered as
owned, that the relevant access-control entry is removed from state.
2020-02-21 21:45:04 +01:00
Ted Blackman
d917eebe56 ford: remove pit short-circuit 2020-02-20 16:38:21 -05:00
Jared Tobin
f4bc103a25
Merge branch 'jt/sh-king-tweak'
* jt/sh-king-tweak:
  sh: ensure release dir exists in static king build

Signed-off-by: Jared Tobin <jared@tlon.io>
2020-02-20 20:00:03 +04:00
Jared Tobin
4c6b665e94
sh: ensure release dir exists in static king build
Fixes a minor bug that can occur when copying the resulting binary.

(Also removes the use of ldd, which doesn't apply in the static binary
case.)
2020-02-20 19:55:49 +04:00
Jared Tobin
fe05a61b8b
Merge branch 'bs/king-uncursed' (#2313)
* origin/bs/king-uncursed:
  king: Terminal input line wasn't being shown b/c line buffering.
  king: Remove TERMINFO_DIRS hack.
  king: First stab at removing terminfo dependency.
  king: New dependency: `ansi-terminal`
  king: Factored all terminal rendering logic into its own module.

Signed-off-by: Jared Tobin <jared@tlon.io>
2020-02-20 14:42:55 +04:00
Benjamin Summers
957c0da9bb
king: Terminal input line wasn't being shown b/c line buffering. 2020-02-20 14:41:07 +04:00
Benjamin Summers
e1f6db7250
king: Remove TERMINFO_DIRS hack. 2020-02-20 14:41:07 +04:00
Benjamin Summers
9d2d6c42c6
king: First stab at removing terminfo dependency. 2020-02-20 14:41:07 +04:00
Benjamin Summers
a318462836
king: New dependency: ansi-terminal 2020-02-20 14:41:06 +04:00
Benjamin Summers
3b1bd6600a
king: Factored all terminal rendering logic into its own module. 2020-02-20 14:41:03 +04:00
Jared Tobin
bed28da17f
Merge branch 'kh/release-build' (#2293)
* origin/kh/release-build:
  king: Use newer static-haskell-nix script for KH build.

Signed-off-by: Jared Tobin <jared@tlon.io>
2020-02-20 09:33:36 +04:00
Jared Tobin
618cfa862b
MAINTAINERS: several updates [ci skip]
* recommend using sh/merge-with-custom-msg
* recommend cherry-picking merge commits
* drop hep from release candidate tag format
* minor other additions
2020-02-18 16:51:07 +04:00
Jared Tobin
915bf1332f
sh/release-archive: 'set -e' in header [ci skip]
Bail out on encountering any errors.
2020-02-18 16:32:21 +04:00
Jared Tobin
6acb751560
sh/merge-with-custom-msg: add checks [ci skip]
* Use 'set -e' to bail on any errors.
* If the pull request number is not specified, bail out.
* Print a simple pre-merge checklist before prompting for merge.
2020-02-17 18:21:34 +04:00
Jared Tobin
36e770f722
Merge branch 'philip/gall-ack-fix' (#2288)
* origin/philip/gall-ack-fix:
  gall: give both acks in case of unexpected ack
  gall: make 2140e07 ota-able
  gall: properly track remote acknowledgments

Signed-off-by: Jared Tobin <jared@tlon.io>
2020-02-14 20:00:50 +04:00
Benjamin Summers
4be4551f18 king: Use newer static-haskell-nix script for KH build. 2020-02-14 07:13:55 -08:00
Jared Tobin
696a1314f7
sh/merge-with-custom-msg: 'origin' handling fix [ci skip]
The KERNEL_CHANGED and PILLS_CHANGED variables used the revision with
'origin' stripped from it (intended for using in messages only), which
caused them to miss remote revisions.

Also tweaks the conditional so that the kernel diff only displays when
pills haven't been updated.
2020-02-14 10:47:18 +04:00
Jared Tobin
e2c4f2cc3f
Merge branch 'm/rep-comment' (#2287)
* origin/m/rep-comment:
  hoon: clarify comments for +rep:in and +rep:by

Signed-off-by: Jared Tobin <jared@tlon.io>
2020-02-14 10:47:08 +04:00
Philip Monk
4fda5e8e38
gall: give both acks in case of unexpected ack
It's hard to say what's the safest thing to do when we get an ack we
weren't expecting due to losing outstanding.agents.state in +load
3-to-4, so this gives both a watch-ack and a poke-ack.  This seems most
likely to succeed.
2020-02-13 17:48:33 -08:00
Philip Monk
e082845e0d
gall: make 2140e07 ota-able
Does not change state type, but clears outstanding.agents.state since
it's full of garbage values.  This introduces a possibility that we may
have been in the middle of something, so we handle that in a reasonably
sane way.
2020-02-13 17:20:27 -08:00
Philip Monk
2140e07a99
gall: properly track remote acknowledgments
outstanding.agents.state is a queue of what sort of message we sent to a
foreign app.  We use it so that when the acknowledgment comes back we
know whether to treat it as a watch-ack, poke-ack, or neither.  We used
to put this info in the wire, but this gave us a different ames flow,
which meant %leave and %watch didn't get associated (causing #2079).

The error was that when when retrieving the item from the queue, we put
the new 1-item-shorter queue back in outstanding.agents.state at a
different wire than it came from, so the queues never actually got
shorter, and acknowledgments of the wrong sort were commonly produced.
This caused problems mainly in situations where we poke and peer on the
same wire, and possibly when a subscription was cancelled.

Possibly related to #2206 and #2176.  I would expect this bug to cause
those issues, but I haven't verified the converse.  Also possibly
related to #2153 and #2079.
2020-02-13 15:12:07 -08:00
Fang
fa138ef216
hoon: clarify comments for +rep:in and +rep:by
"Replace" suggests this function either produces an updated set/map when done,
like +snap, or changes all values in-place, like +turn. In truth, it's more
similar to +roll, which does reduction/accumulation.

("Reduce" specifically was chosen because it maintains the mnemonic relation to
the arm name.)
2020-02-13 23:56:44 +01:00
Jared Tobin
7be9ed95ab
sh/merge-with-custom-msg: add pill update check [ci skip]
It's very easy to forget to verify that pills have been updated
accordingly when the kernel changes.  This adds a warning that prints
when the kernel in the target has changed but the pills have not.

Also prompts the user for confirmation pre-merge.
2020-02-13 19:05:18 +04:00
Jared Tobin
f848d60b68
Merge branch 'philip/ames-fix' (#2268)
* origin/philip/ames-fix:
  ames: make routing simpler

Signed-off-by: Jared Tobin <jared@tlon.io>
2020-02-12 16:44:10 +04:00
Philip Monk
41fd367bff
ames: make routing simpler 2020-02-10 17:49:18 -08:00
Jared Tobin
be5fb8b9cf
Merge branch 'king-haskell' (#2107)
* origin/king-haskell: (411 commits)
  Fix counting bug in event log replay.
  fix progress bar in daemon mode
  Got Linux release builds working again.
  king: style improvements
  king: Build without warnings.
  Fix king-haskell Linux release build.
  Update scripts to point to `urbit-king`.
  Renamed modules Ur.** to Urbit.** to be consistent with urbit-{atom,hob}
  king: Rename `king` package to `urbit-king`.
  Clean up `Urbit.Atom` and move it into it's own package.
  Module structure, doc strings
  Bump stackage version.
  Got docs to build.
  king haskell: automatically connect to terminal when running a ship
  king: add partial-replay and --dry-from
  Make sure we close HTTP sockets on close (or reconfigure).
  Hack around terminfo database problem.
  Fixed bug in HTTP Server (only first block from stream was handled).
  Logging for event sourced responses.
  Cleanup port binding logic.
  ...

Signed-off-by: Jared Tobin <jared@tlon.io>
2020-02-10 18:53:41 +04:00
Liam Fitzgerald
5449a0e05b hoon: support %spot hint in xray 2020-02-10 14:20:46 +10:00
Liam Fitzgerald
5cd189f83c hoon: add %spot typehint
Adds a `[%spot *]` type to the `note` type annotation definition.
These are added when the %dbug hoon is encountered. Done to enable
jump to defintion in the language-server.
2020-02-07 17:57:54 +10:00