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
Philip Monk
7583d33cf1
Merge pull request #5436 from urbit/m/claz-lockup-txs
...
claz: better linear lockup ops support
2021-12-07 18:41:55 -08:00
yosoyubik
ad16155c77
azimuth: load azimuth state from state snapshot
2021-12-03 16:11:15 +01:00
fang
2c71a5d79d
azimuth: update ecliptic address
...
To account for the recent upgrade.
2021-12-02 21:45:39 +01:00
yosoyubik
d5c44598ba
roller: refactor and clean up
2021-11-28 16:37:06 +01:00
yosoyubik
8c8aef96aa
dice: include nas when rolling over tx-effects
2021-11-25 21:22:15 +01:00
fang
14bfcc0288
claz: add upgrade poll support
2021-11-25 11:56:42 +01:00
yosoyubik
2e94a0d446
azimuth, dice: simplify index update
2021-11-24 15:31:59 +01:00
yosoyubik
528a046b51
roller: add to state ship allowance and next-slice
2021-11-23 10:55:50 +01:00
yosoyubik
144065c4fc
roller-rpc: add %get-remaining-quota
2021-11-22 14:02:31 +01:00
Yaseen
8819d61ff6
symlink arvo/lib/azimuth.hoon to base-dev/lib/azimuth.hoon
2021-11-19 12:33:12 -05:00
fang
130761039d
claz: include linear release txs
2021-11-18 17:46:53 +01:00
Philip Monk
a2a89d3532
Merge remote-tracking branch 'origin/next/arvo' into philip/roller
2021-11-16 13:58:57 -08:00
Philip Monk
4656372b09
Merge pull request #5426 from ynx0/claybel
...
clay: support labels
2021-11-15 08:49:31 -08:00
yosoyubik
0d592f67d1
Merge remote-tracking branch 'origin/philip/roller' into naive/roller
2021-11-15 05:48:57 +01:00
yosoyubik
a8ccf5c32e
roller-rpc: fix typo
2021-11-15 05:44:52 +01:00
Philip Monk
23980d1f64
kiln: throw away pending commits on good commits
...
When we receive a commit that we can apply from the source, we throw
away any skipped pending commits. This lets us receive updates at the
current kelvin even if we heard pending commits for later kelvins.
2021-11-12 14:38:17 -08:00
Philip Monk
901bcdf7b8
kiln: don't allow bump-many for non-current kelvin
2021-11-12 14:37:54 -08:00
Yaseen
25ce97cade
clay: add support for labeling commits
...
- add helper arm `label:de`
- update relevant code to take in arbitrary aeons
2021-11-12 15:35:06 -05:00
Philip Monk
6665bc0986
kiln: fix |bump to not require except
2021-11-12 12:06:45 -08:00
yosoyubik
cb1567a4ac
dice: remove extra p
2021-11-11 06:36:27 +01:00
Philip Monk
74ad24acb9
kiln: don't bump on-load
2021-11-10 18:08:27 -08:00
yosoyubik
ed2d9bb482
Merge remote-tracking branch 'origin/philip/roller' into naive/roller
2021-11-10 18:44:25 +01:00
yosoyubik
e32b0a1956
roller: add sponsorship index
2021-11-10 17:46:22 +01:00
Philip Monk
3290b68d40
Merge remote-tracking branch 'origin/naive/roller' into philip/roller-ci
2021-11-10 00:41:25 -08:00
Philip Monk
c2933c017f
kiln: don't bump suspended desks
2021-11-09 23:49:37 -08:00
yosoyubik
dd20bbd1d3
naive-transactions: remove unused arm
2021-11-10 08:29:37 +01:00
Philip Monk
9fc74f60d9
Merge remote-tracking branch 'origin/master' into philip/roller
2021-11-09 22:03:25 -08:00
yosoyubik
48fd671b9a
various: removed unused/wip files
2021-11-10 06:23:36 +01:00
Philip Monk
60436f2673
Merge remote-tracking branch 'origin/naive/roller' into philip/roller
2021-11-09 10:47:48 -08:00
yosoyubik
084c70497d
roller-rpc: fix serializing tx for personal_sign
2021-11-09 19:18:10 +01:00
yosoyubik
502fd5822b
roller-rpc: add rpc %spawns-remaining
2021-11-09 16:08:30 +01:00
Philip Monk
8bfb4acc20
pill: set everything to mainnet for consistency
2021-11-09 00:59:40 -08:00
Philip Monk
8d20ce1f56
azimuth: set mainnet naive contract
2021-11-08 22:32:15 -08:00
Philip Monk
681faa68e4
azimuth: send updates to jael
2021-11-08 21:56:47 -08:00
Philip Monk
91b38d4cea
ivory: update preboot validation format
...
string<->numbers didn't match the json serialization. This makes
preboot validation succeed.
2021-11-08 20:34:32 -08:00
Liam Fitzgerald
536e7a27e0
kiln: prevent unnecessary bumps when reloading
...
If a desk is suspended/paused/local, then we should exclude it when
bumping in the +on-load, because a suspended/paused/local desk cannot
have a pending commit that would allow it to bump successfully.
2021-11-08 16:46:00 -06:00
yosoyubik
9e2e6a7aee
roller-rpc: add %hash-raw-transaction rpc
...
the returned hash can be used to cancel pending txs
by signing the message 'cancel: 0xke.ccak'
2021-11-08 17:47:55 +01:00
yosoyubik
b2a7c2830f
Merge branch 'naive/roller' into naive/roller-personal-sign
2021-11-07 10:57:15 +01:00
yosoyubik
095ce0dff4
roller: wip add quota per ship for tx submission
2021-11-06 10:27:00 +01:00
yosoyubik
1c641629e2
roller: add azimuth refresh-rate to getConfig RPC
2021-11-04 09:54:25 +01:00
yosoyubik
aabf028b89
roller: wip support for metamask personal_sign
2021-11-03 16:58:57 +01:00
yosoyubik
27576e272b
Merge remote-tracking branch 'origin/philip/naive' into naive/roller
2021-10-31 15:14:15 +01:00
fang
0ec3d5111d
Merge branch 'master' into naive/roller
2021-10-26 20:46:32 +02:00
fang
36cd69b6d0
Merge tag 'urbit-os-v2.100' into naive/roller
2021-10-26 17:08:03 +02:00
hosted-fornet
19693a6fb7
crunch: remove from base to allow distribution as app
2021-10-21 21:28:29 -07:00
yosoyubik
824de38532
roller: wip order roller tx history by timestamp
2021-10-16 12:47:39 +02:00
yosoyubik
a392ccde58
roller: wip finding map simplification
2021-10-16 07:26:57 +02:00
yosoyubik
91be390397
roller: use an ordered map for tracking L2 batches
2021-10-11 17:16:17 +02:00
fang
8ed93c27c4
kiln: re-emit clay listen for affected ships
...
Previous version of kiln had a bug where a crash caused the listen to be
dropped, making kiln ignore base commits.
2021-10-07 23:12:42 +04:00
fang
bbc20e6bb7
kiln: safely bump not-yet-installed desks
...
Previously this wasn't accounting for the "couldn't read kelvin from
local desk" case properly, resulting in crashes during updates to base,
after which other desks wouldn't be started back up.
2021-10-07 22:29:24 +04:00
Hunter Miller
62741df416
Merge pull request #5300 from urbit/ted/kiln-dudes
...
kiln: refresh dudes on local reinstall
2021-10-06 17:42:46 -05:00
Philip Monk
163ca690ce
naive: remove unused arms
2021-10-05 23:58:59 -05:00
Philip Monk
7b528e823f
naive: final touch-up
2021-10-05 22:20:35 -05:00
Ted Blackman
adf8670c31
kiln: refresh dudes on local reinstall
2021-10-04 18:17:29 -04:00
fang
aa48973c6a
Merge branch 'release/next-userspace'
2021-10-04 23:45:45 +04:00
yosoyubik
4d1c6c230f
roller: proper parsing of crypto-suite
2021-10-04 12:44:54 +02:00
fang
66b8c046b7
kiln: don't +mean the tang noun alongside the tang
2021-10-02 13:07:23 +02:00
Fang
fd85eb8176
desk-jam: exclude /tests from desk jams
2021-09-29 22:59:19 +04:00
Fang
27fcc9b4c3
various: %home -> %base
2021-09-29 22:13:08 +04:00
Liam Fitzgerald
31f5898087
kiln: track original publisher with desk.ship file
2021-09-29 13:27:28 +10:00
Ted Blackman
597e36b8f9
kiln: fix local reinstall
2021-09-28 22:27:42 -04:00
Fang
de409e6edb
kiln: adjust dudes even if remote is identical
...
There might be cases where the local situation still doesn't match. This
lets us recover from that.
2021-09-29 00:56:35 +04:00
Ted Blackman
3f5dc4d5e5
kiln: give %commit fact on no-op download
2021-09-28 15:43:25 -04:00
Ted Blackman
5511cc95b5
docket,kiln: snapshot on %watch
2021-09-28 15:33:16 -04:00
Fang
400d2e4f44
Merge remote-tracking branch 'origin/lf/versioning-marks-dist' into dist
2021-09-28 17:13:33 +04:00
Fang
c9e8c8ca60
kiln: make dist desks public on-boot
...
So that our sponsees (and other ship) can install the software on them.
2021-09-28 16:22:37 +04:00
Liam Fitzgerald
77f7b05939
kiln: version external marks
2021-09-28 12:50:45 +10:00
Ted Blackman
ba353fbd36
kiln: local aeon 0 check
2021-09-27 21:47:42 -04:00
Ted Blackman
1a16496308
./symbolic-merge.sh base-dev arvo
2021-09-27 21:02:18 -04:00
Hunter Miller
9f45dce312
Merge branch 'dist' of github.com:urbit/urbit into dist
2021-09-27 18:57:16 -05:00
Hunter Miller
72e3aca57c
Merge branch 'ea/master-dist-deconflict' into dist
2021-09-27 18:56:49 -05:00
Hunter Miller
502f2e8a9c
Merge branch 'hm/btc-wallet-conflict-resolution' into ea/master-dist-deconflict
2021-09-27 18:55:45 -05:00
Ted Blackman
855e97d17a
kiln: update other agents on kernel updates
2021-09-27 19:34:15 -04:00
Fang
18701b2ad2
kiln: always check local desk when adjusting dudes
...
We do not care about what's on foreign, the local desk is the thing
we're taking action on. This is more robust in the face of absent
information about foreign desks etc.
Also stops pretending to take-commet during take-merge-main. We'll get a
separate commit event.
2021-09-28 00:57:38 +04:00
Edward Amsden
02d2185eb3
move hoons to base-dev
2021-09-27 15:10:19 -04:00
Ted Blackman
7665e75849
manual merge @liam-fitzgerald misc. fixes PR
2021-09-27 14:50:58 -04:00
Ted Blackman
c947f899e6
-jam-all-desks: prevent recursive tempfile cancer
2021-09-27 14:20:44 -04:00
yosoyubik
f243500068
Merge remote-tracking branch 'origin/philip/naive' into naive/roller
2021-09-27 16:29:12 +02:00
Fang
ca6636b149
kiln: ensure +vats engine always initialized
...
This was not the case for +poke-install, leading us to write a vat to
state under the %$ desk.
2021-09-27 15:06:47 +04:00
yosoyubik
a7ff010768
roller: return cryptoSuite in point as json string
2021-09-27 06:44:38 +02:00
yosoyubik
737afea9fa
roller: return ship in rawTx as json number
2021-09-27 06:44:07 +02:00
Ted Blackman
ede1976745
kiln: partial fixes for +take-download scry crash
2021-09-27 00:08:11 -04:00
Ted Blackman
9aa8566a6e
-jam-all-desks
2021-09-26 22:03:13 -04:00
Ted Blackman
2544b79e4b
kiln,desks: remove %fish from /desk/bill; fix some other kiln issues
2021-09-26 17:03:26 -04:00
Ted Blackman
54e7f31d25
kiln: minor print cleanup
2021-09-26 15:32:27 -04:00
Ted Blackman
38767e5dee
kiln: don't merge %kids from random desks
2021-09-26 01:07:45 -04:00
Ted Blackman
9d4cd216b3
kiln: +fmt for slogging
2021-09-26 01:07:23 -04:00
Ted Blackman
d81a4a7cba
dill,kiln: fixes for boot and same-kelvin OTAs
2021-09-26 00:20:37 -04:00
Fang
ed516900e7
kiln: notify about local installs
...
Remote install send a %commit because they receive new files. Local
installs never receive files, so weren't notifying kiln subscribers.
Here we "manually" send a %commit fact when installing a local desk.
2021-09-25 18:26:04 +04:00
Ted Blackman
6bf3a7fe4c
Merge branch 'ted/dist-migrate-wip' into dist
2021-09-23 18:12:09 -04:00
Ted Blackman
c80fb82318
clay,kiln,landscape/notify: migration runs
2021-09-23 18:07:13 -04:00
Philip Monk
32f07f4c3e
naive: add block-number to input
...
Unused, but will be used to trigger all upgrades
2021-09-23 12:24:20 -05:00
Liam Fitzgerald
5dadee5375
Merge remote-tracking branch 'origin/dist' into m/dist-ames-glob-fixes
2021-09-23 15:50:55 +10:00
Fang
6812d15480
gall, kiln: better migration logic
2021-09-22 22:34:20 +02:00
Liam Fitzgerald
f3befc8afc
hood: fix pause poke
2021-09-22 13:20:05 +10:00
Fang
0512ed1281
Revert "kiln: better +install-local fix"
...
This reverts commit e4949aeb6f
2021-09-21 19:06:03 +02:00
Fang
e4949aeb6f
kiln: better +install-local fix
...
We have an upstream, and it is local.
2021-09-21 17:53:17 +02:00
Fang
8d91e8a903
kiln: safer +install-local printf
...
We don't have upstream tracking state for local installs, so this
would just crash.
2021-09-21 17:32:27 +02:00
Liam Fitzgerald
571f8cef5e
kiln: actually unpause desk
2021-09-21 12:49:04 +10:00
