Commit Graph

27326 Commits

Author SHA1 Message Date
Joe Bryan
477c24974a Merge branch 'master' into release/next-vere
* master: (1167 commits)
  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
  Show wallet scan progress
  Map dollar sign to USD
  ...
2021-09-02 12:36:31 -04:00
Joe Bryan
422786afd4 Merge remote-tracking branch 'upstream/m/multipass' into jb/rc
* upstream/m/multipass:
  kh: improve code style
2021-09-02 12:29:46 -04: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
Joe Bryan
137dea5b41 Merge branch 'jb/urcrypt' into jb/next-gen-term
* jb/urcrypt:
  build: fixes mingw static builds, tweaks urbit configure --enable-static
  build: updates pmnsh to *prepend* to PKG_CONFIG_PATH
2021-08-31 11:09:27 -04:00
Joe Bryan
22e1813ae2 build: fixes mingw static builds, tweaks urbit configure --enable-static 2021-08-30 14:14:27 -04:00
Joe Bryan
a92dcbb64f build: updates pmnsh to *prepend* to PKG_CONFIG_PATH 2021-08-30 14:13:53 -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
Joe Bryan
bdb5e29ff1 u3: refactors address layout macros, combines darwin/aarch64 2021-08-20 14:48:52 -04:00
Joe Bryan
c28c3e040b test: removes obsolete scrypt test comment 2021-08-19 22:15:20 -04:00
Joe Bryan
5b7af05bb4 u3: renames secp init/stop functions, fixes comment 2021-08-19 22:14:52 -04:00
Joe Bryan
c73e595d32 u3: fixes sample deconstruction error handling in scrypt jets 2021-08-19 22:09:41 -04:00
Joe Bryan
a313420101 u3: fixes u3kc_bex() refcount, updates style 2021-08-19 22:02:30 -04:00
Joe Bryan
d0ad97735e build: adds urcrypt to top-level shell.nix 2021-08-19 21:58:41 -04:00
Joe Bryan
425f164942 urcrypt: restores pkg-config api versioning scheme 2021-08-19 21:58:18 -04:00
Joe Bryan
507c681555 build: restore division between pkg-config and regular deps 2021-08-19 20:36:00 -04:00
Joe Bryan
f40b519cce mingw: sets libh2o install dir (for accurate pkg-config info) 2021-08-19 20:36:00 -04:00
Joe Bryan
64a8c104c5 pmnsh: adds support for pkg-config 2021-08-19 20:36:00 -04:00
Joe Bryan
21498a5d93 build: update mingw CI to use "ares" cachix cache 2021-08-19 20:36:00 -04:00
Joe Bryan
80765b9516 build: fixes urbit+urcrypt mingw build 2021-08-19 20:36:00 -04:00
Joe Bryan
dfb42f4c6f build: remove obsolete (urcrypt-vendored) dependencies 2021-08-19 20:35:48 -04:00
Joe Bryan
d137436fe8 build: normalize our use of pkg-config, rename urcrypt config 2021-08-19 20:32:55 -04:00
Joe Bryan
e3cd08b96a build: implements static builds in urbit ./configure, prunes deps 2021-08-19 20:32:53 -04:00
Joe Bryan
d1a9ae4b2c build: hack urbit configure for static linking 2021-08-19 20:32:51 -04:00
Joe Bryan
b993ca2c25 build: force static urcrypt on darwin 2021-08-19 20:32:50 -04:00
Joe Bryan
fbea80467d urcrypt: updates libaes_siv link test, supplying -lcrypto 2021-08-19 20:32:48 -04:00
Joe Bryan
935a51def9 urcrypt: updates shared-library build test, accounts for mangling 2021-08-19 20:32:46 -04:00
Joe Bryan
22c11242b9 build: gitignore urcrypt build results 2021-08-19 20:31:13 -04:00
Joe Bryan
9939d3419b build: gitignore library binaries 2021-08-19 20:22:06 -04:00
Joe Bryan
d6f30c5f6c Merge commit '0b3f9a629f864ad1e68c5f5a73d11c93ae42d644' into jb/urcrypt-merge
* commit '0b3f9a629f864ad1e68c5f5a73d11c93ae42d644':
  Squashed 'pkg/urcrypt/argon2/' changes from 4da94a611e..a4c1e3f713

git subtree pull --prefix pkg/urcrypt/argon2 \
  git@github.com:urbit/argon2.git master --squash
2021-08-19 20:05:34 -04:00
Joe Bryan
0b3f9a629f Squashed 'pkg/urcrypt/argon2/' changes from 4da94a611e..a4c1e3f713
a4c1e3f713 Merge pull request #2 from locpyl-tidnyd/master
11286ba1de Rename function to avoid name clash on MingW

git-subtree-dir: pkg/urcrypt/argon2
git-subtree-split: a4c1e3f7138c2e577376beb99f964cf71e1c8b1b
2021-08-19 20:05:34 -04:00
Joe Bryan
0b19f51a6b Merge remote-tracking branch 'frodwith/urcrypt' into jb/urcrypt-prep
* frodwith/urcrypt: (75 commits)
  move libaes_siv to deps
  fix typo in urcrypt.h
  libaes_siv now using tip of dfoxfranke master
  check for recovery header presence in configure, put -O3 in flags, move pc to distcleanfiles
  clean generated pkg-config file
  update urbit's configure to use a liburcrypt version
  add a versioning scheme to urcrypt
  remove scrypt from urbit build (in urcrypt now)
  move the rest of the scrypt jets to urcrypt, enable them, and correct the hoon test to match the source rfc.
  scr-pbk->urcrypt
  start scrypt porting
  Squashed 'pkg/urcrypt/scrypt/' content from commit a402f4116
  finish porting secp jets to urcrypt
  pkg-config support for urcrypt, update urbit build
  cosmetic configure things
  require shared ssl when building a shared urcrypt
  remove some old files
  add autogen.sh
  use srcdir in -I to support out of tree builds
  whitespace and symbol cleanup
  ...
2021-08-19 20:03:19 -04:00
janeway
fa894b9690 glob: update to 0v758lj.uf0s5.0nh3m.gunn6.942gj 2021-08-19 15:25:15 -07:00
ixv
111f1837c0 Merge remote-tracking branch 'finned/fix-various-issues-in-release' 2021-08-19 15:19:28 -07:00
finned-palmer
09bfb81c84 Fix feepicker issues 2021-08-19 17:13:23 -05:00
finned-palmer
b4eae08f88 Add exit buttons to invoices 2021-08-19 17:12:56 -05:00
finned-palmer
a0e0f3404c Fix issue with change provider button not triggering modal 2021-08-19 09:33:37 -05:00
finned-palmer
82766647c6 Fix scanning text issues 2021-08-19 09:31:50 -05:00
finned-palmer
2ae99433c4 Fix enum, was breaking signer button 2021-08-19 09:25:26 -05:00
finned-palmer
0ebd41915a Fix imports in ExternalInvoice 2021-08-19 09:25:03 -05:00
janeway
6ab7f53fff glob: update to 0v4.e52ik.udm4j.6aus5.02b25.vomaj 2021-08-18 18:12:52 -07:00
ixv
764d018973 btc-wallet: fix imports 2021-08-18 18:07:20 -07:00
ixv
5f56eb9a1b Merge branch 'lf/aqua-revive' 2021-08-18 17:36:01 -07:00
ixv
2578233aed Merge remote-tracking branch 'hosted-fornet/add-crunch-library-and-generator' 2021-08-18 17:30:36 -07:00
ixv
6cd4f6d751 aqua: assert pill type 2021-08-18 17:25:17 -07:00
ixv
3f38506125
Merge pull request #5149 from finned-palmer/switch-to-typescript
btc-wallet: Port btc-wallet to typescript.
2021-08-18 09:59:01 -07:00
finned-palmer
62efce52b8 Port BTC wallet to Typescript 2021-08-18 07:31:08 -05:00
finned-palmer
e9546b360a Merge branch 'release/bitcoin-wallet' of git://github.com/urbit/urbit into release/bitcoin-wallet 2021-08-18 07:02:52 -05:00
finned-palmer
237e14399c Match edouard's designs 2021-08-17 10:09:07 -07:00
finned-palmer
216e5b19ac Add external (psbt) invoice 2021-08-17 10:09:07 -07:00
finned-palmer
b93e2a15e3 Fix copy from non-secure context issue 2021-08-17 10:09:07 -07:00