Commit Graph

413 Commits

Author SHA1 Message Date
fang
721fa05519
Merge branch 'next/arvo' into next/dill 2023-01-03 18:56:33 +01:00
fang
2c5510db64
Merge branch 'jb/next-gen-term' into next/dill
Resolves a good number of conflicts. Most notably, re-propagates removal
of gall's %onto, confirms new /app/herm behavior, coerces hood/drum
state adapters back into place, and updates webterm to use the latest
api.
2022-01-24 14:50:16 +01:00
Joe Bryan
15148c72bf Merge branch 'master' into next/vere
* master:
  [nix] track nixos-21.11 branch whenever niv updates, bump to include qemu-in-virtualization fix
  webterm: v1.0.0
  herm: permission checks
  herm: avoid trailing empty path segments
  pmnsh: update secp256k1 configure flags
  secp256k1: use nixpkgs provided secp256k1 and add to sources-pmnsh
  webterm: remove border, let term live in page
  theme: cleaning up a few mismatches
  webterm: handle old-style blits and belts
  build: correct lmdb static builds
  build: explicitly override h2o build platforms to support darwin
  ci: upgrade cachix/install-nix-action from v13 -> v16
  build: remove haskell related nix code and haskell.nix dependency
  webterm: update imports
  @urbit/api: move term types
  webterm: fix broken imports
  webterm: update package name for lerna
  webterm: commit missing api files
  webterm: backport
2021-12-17 23:38:22 -05:00
Joe Bryan
eeac4e5489
Merge pull request #5195 from urbit/pp/leaks2
king: fix several more space leaks
2021-12-17 20:18:42 -08:00
Joe Bryan
c4cf6bf655
Merge pull request #5000 from ryjm/jm/merciful-king
king: don't kill on C-d
2021-12-17 20:17:52 -08:00
Joe Bryan
60cefe192e
Merge pull request #5182 from urbit/naive/preboot
L2 preboot validation (kh)
2021-12-17 20:16:33 -08:00
Brendan Hay
16379db9b0
build: remove haskell related nix code and haskell.nix dependency
* Upgrades the nixpkgs pin to 21.11.
* Removes nix code, sources, and attributes related to haskell.nix and
  the code under pkg/hs.
* Continuous integration no longer builds (or packages/releases)
  urbit-king (haskell).
* To continue to developing any haskell code under pkg/hs it's left as
  a user exercise uto install and configure GHC/Stack.

As a consequence running nix-shell should be considerably more
performant and requires downloading or building less dependencies.
2021-12-08 10:06:42 +01:00
Philip Monk
06e5c59635
vere: bump version to 1.8 2021-11-19 18:41:32 -08:00
Philip Monk
1c26ef6fe9
urbit-king: bump zuse to 419 2021-11-19 18:33:58 -08:00
fang
77732e186f
Merge branch 'naive/roller' into naive/preboot 2021-11-08 20:52:59 +01:00
Philip Monk
21e3b2b2f9
vere: bump version to 1.7 2021-11-01 22:03:15 -07:00
Joe Bryan
5385889ebd Revert "Revert "Merge pull request #4463 from urbit/m/next-gen-term""
This reverts commit 3fba32185d.
2021-09-24 23:14:55 -04:00
Joe Bryan
b1bc4b54f3 Merge branches 'jb/rnv-restage' and 'jb/rnv-fixes', remote-tracking branches 'frodwith/keccak' and 'botter-nidnul/release/next-vere' into jb/rnv-merge
* jb/rnv-restage:
  build: patch windows uv_pipe impl to allow null writes
  build: update pmnsh to support cachix text/x-nix-narinfo responses
  vere: renames terminal streams for clarity, removes unused uv_tcp_t
  vere: suppress null writes in term.c
  Revert "Merge pull request #4463 from urbit/m/next-gen-term"

* jb/rnv-fixes:
  vere: bumps versions
  vere: fixes crash (null deref) in comet booting
  u3: fixes printf in c3_assert()

* frodwith/keccak:
  jets: ice keccak
  working keccak jets
  urcrypt: fixing some typos - now builds
  Squashed 'pkg/urcrypt/keccak-tiny/' content from commit 9b438dc0f7
  urcrypt,jets: initial commit of keccak material

* botter-nidnul/release/next-vere:
  urcrypt: argon2 only optimize for x86_64 on x86_64
2021-09-24 18:05:37 -04:00
Joe Bryan
af77576511 vere: bumps versions 2021-09-24 17:38:46 -04:00
Joe Bryan
3fba32185d Revert "Merge pull request #4463 from urbit/m/next-gen-term"
This reverts commit 39667fc071, reversing
changes made to 698fd6f66f.
2021-09-24 16:33:15 -04:00
Joe Bryan
148779f4d4 Merge branch 'release/next-vere' into jb/next-gen-term
* release/next-vere: (67 commits)
  pill: all
  kh: improve code style
  glob: update to 0v758lj.uf0s5.0nh3m.gunn6.942gj
  Fix feepicker issues
  Add exit buttons to invoices
  Fix issue with change provider button not triggering modal
  Fix scanning text issues
  Fix enum, was breaking signer button
  Fix imports in ExternalInvoice
  glob: update to 0v4.e52ik.udm4j.6aus5.02b25.vomaj
  btc-wallet: fix imports
  aqua: assert pill type
  Port BTC wallet to Typescript
  Match edouard's designs
  Add external (psbt) invoice
  Fix copy from non-secure context issue
  Use deSig for isPatp
  Use deSig rather than concat
  Add sig to valid patp in send component
  Just show total main/change addresses scanned
  ...
2021-09-09 11:48:43 -04:00
Fang
307bc27913
kh: improve Dawn code style
Based on PR feedback. Explicit argument types, improved NOTE style,
updated comments.
2021-09-01 17:32:59 +02:00
Fang
5fcf570c99
kh: prefer withObject helper over custom parser 2021-09-01 17:28:45 +02:00
Fang
aec9883c3b
kh: parse pubkeys at json parsing site, not later
This ensures we crash early if the received data is in an unexpected
format or otherwise not sane.
2021-09-01 17:27:13 +02:00
Fang
28df07313c
kh: improve code style
Based on PR feedback. Better naming, NOTE style, and increased purity.
2021-09-01 16:57:30 +02:00
pilfer-pandex
9b1c9db773 king: fix warnings for contbuild 2021-08-30 20:12:13 -04:00
pilfer-pandex
dcc10c170e Bound the lane cache 2021-08-30 20:01:51 -04:00
pilfer-pandex
bb793e0d96 king: fix actual perf problem: crufty LargeKey math in Packet.hs 2021-08-30 20:01:41 -04:00
pilfer-pandex
c05b5ecdc0 king: fix unbounded queues in Pier.hs; how did I miss this 2021-08-30 20:01:24 -04:00
pilfer-pandex
32a4c8a375 king: my god, I shall flog the man responsible for this! 2021-08-30 19:56:33 -04:00
pilfer-pandex
51373a0976 king: better cost center tagging in from/toNoun TH 2021-08-30 19:55:44 -04:00
pilfer-pandex
11d18a7026 king: properly mark named I hope in th 2021-08-30 19:53:07 -04:00
pilfer-pandex
0c96d9d6e8 king: psqueue lane cache; enhance FromNoun TH SCCs 2021-08-30 19:52:29 -04:00
pilfer-pandex
ae0f5f0242 king: unstrict packet 2021-08-30 19:48:54 -04:00
pilfer-pandex
99851040ea king: some strict data 2021-08-30 19:48:54 -04:00
pilfer-pandex
f8d341b3b0 king: make everything use Urbit.Prelude rather than ClassyPrelude 2021-08-30 19:48:54 -04:00
Joe Bryan
4320e5e8ee Merge branch 'jb/urcrypt' into jb/next-gen-term
* jb/urcrypt: (187 commits)
  test: removes obsolete scrypt test comment
  u3: renames secp init/stop functions, fixes comment
  u3: fixes sample deconstruction error handling in scrypt jets
  u3: fixes u3kc_bex() refcount, updates style
  build: adds urcrypt to top-level shell.nix
  urcrypt: restores pkg-config api versioning scheme
  build: restore division between pkg-config and regular deps
  mingw: sets libh2o install dir (for accurate pkg-config info)
  pmnsh: adds support for pkg-config
  build: update mingw CI to use "ares" cachix cache
  build: fixes urbit+urcrypt mingw build
  build: remove obsolete (urcrypt-vendored) dependencies
  build: normalize our use of pkg-config, rename urcrypt config
  build: implements static builds in urbit ./configure, prunes deps
  build: hack urbit configure for static linking
  build: force static urcrypt on darwin
  urcrypt: updates libaes_siv link test, supplying -lcrypto
  urcrypt: updates shared-library build test, accounts for mangling
  build: gitignore urcrypt build results
  build: gitignore library binaries
  ...
2021-08-20 16:59:33 -04:00
Fang
7925171b77
kh: remove unused data structures from Dawn.hs 2021-08-11 02:03:32 +02:00
Fang
8c19f543d3
kh: L2 preboot validation
As in f3b57d7b6 and its follow-up commits, except it's King Haskell.
2021-08-11 02:02:23 +02:00
fang
288c2121d1
kh: respect slog priority
When printing slogs, if priority is greater than zero, prefix with '>'
characters, and adjust the slog color.
2021-06-17 23:49:45 +02:00
fang
eadd7aad01
kh: rewrite hijack to guarantee lojacking
No longer allow lojack to be called independently, instead requiring
logic to be inserted between hi- and lojack's io.
2021-06-17 23:49:44 +02:00
fang
addcf42468
kh: improve code style
Removes superfluous parens, makes better use of pattern matching, and
respects project-wide capitalization style.
2021-06-17 23:49:44 +02:00
fang
b3964c97a6
kh: implement null check correctly 2021-06-17 23:49:43 +02:00
fang
ddf579bd75
kh: fail to parse invalid belts
Previously we would allow the tags that were added Haskell-side for
union type syntax. Now we explicitly reject those before falling back
to the auto-generated noun parsing logic.
2021-06-17 23:49:42 +02:00
fang
bdaad4cf84
kh: don't error during key validation
Instead produce an Either.
2021-06-17 17:42:44 +02:00
fang
f8d5a1644c
kh: improve naming and code style 2021-06-17 14:48:09 +02:00
fang
2d01e1851f
Merge branch 'master' into m/multipass 2021-06-09 14:34:49 +02:00
ryjm
0142fce219 king: add crud event to jael 2021-06-09 05:54:57 -04:00
ryjm
971da9ab82 king: don't kill on C-d 2021-06-09 05:10:15 -04:00
ryjm
8ad9d022a1 king: fix noun derivation 2021-06-09 01:50:34 -04:00
fang
3b81e35260
dawn: better multikey format
Improves the multikeyfile format by taking a single ship and a list of
life+key pairs, instead of a list of full seeds.

Also decouples these changes from the dawn event, once again putting a
single seed into it. In the multikeyfile case, keys are injected as
%rekey events to jael near the end of the boot sequence.

Haskell-side changes may or may not be incomplete, boot presently fails
at some unknown point with what looks like a noun conversion error.
2021-06-04 01:49:15 +02:00
fang
cc362b27c9
kh: support multikeyfiles 2021-06-03 01:04:45 +02:00
fang
2e2361e522
kh: expose to/fromNoun template logic separately
Separately from deriveNoun, which gives you an entire instance. Having
access to these lets you call out to the auto-generated conversion
logic when writing custom code for it.
2021-06-03 00:59:55 +02:00
fang
0f6c3c05cd
term: best-effort compatibility with old blits
Render old %lin and %mor blits, for backwards compatibility with old
dill.
2021-05-27 20:26:12 +02:00
fang
719ff8b442
Merge branch 'master' into m/next-gen-term
Notably includes some changes to webterm's app.tsx that are required to
keep it functioning correctly. As of yet unclear why exactly this is
necessary, presumably hook shenanigans triggered by recent-ish changes.
2021-05-15 00:21:06 +02:00