Commit Graph

1515 Commits

Author SHA1 Message Date
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.

The better fix wasn't better at all!
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
Fang
da28fbfed9
Merge dist into m/distpilled 2021-09-20 19:35:51 +02:00
fang
b0236e5de5
azimuth: update for latest ecliptic address 2021-09-20 18:15:56 +02:00
yosoyubik
e3faa84c92 azimuth-roll-rpc: add sig to json pending-tx 2021-09-20 08:33:53 +02:00
yosoyubik
aa601453d3 roller: include time in pending txs response data 2021-09-20 07:29:17 +02:00
yosoyubik
85debb1ce9 ethereum: add block to %eth-get-balance 2021-09-20 07:19:05 +02:00
Liam Fitzgerald
7b9b0c62b7 various: update symbolic merges 2021-09-17 14:54:01 +10:00
Liam Fitzgerald
143a8e08e6 various: fix dependencies & tests 2021-09-17 14:51:19 +10:00
Ted Blackman
3b30b67a3e Merge branch 'ted/kiln-warp' into m/distpilled, and
modify Kiln to listen for %writ's from Clay to track commits to Clay
that were not generated by Kiln itself.
2021-09-16 12:25:02 -04:00
Fang
a29c3414d9
solid: support generating multi-desk pills
Notably, we include the base desk last. This is to ensure that the
other desks are present by the time kiln gets loaded from base, letting
it install the software on the other desks, as per 22ad2516c.
2021-09-15 23:53:52 +02:00
Fang
22ad2516c9
kiln: install from existing desks during +on-init
During kiln's +on-init, we now check for non-base (and non-kids) desks.
If any are present, we execute the install flow for them, and set them
to sync from our sponsor afterwards.

This depends on work done in d7afe3229, in that without those changes
the successive +find requests from kiln to clay would clobber each
other, leaving only the "install from sponsor" one active, thus never
actually installing the desk for which we already have the files.
2021-09-15 23:53:24 +02:00
Fang
d7afe32291
kiln: synchronize install flow for local desks
When installing from an existing local desk, kiln now scries the
relevant data out of clay instead of sending moves to it and awaiting
responses.

This prepares for coming kiln work.
2021-09-15 23:52:50 +02:00
Ted Blackman
577ec24459 kiln: WIP listen to %warp's too 2021-09-15 22:57:08 +03:00
Joe Bryan
49b84d03e7 naive: fixes bug (absolute vs relative step) in signature octs slice 2021-09-15 13:28:44 -04:00
Joe Bryan
bb53d5a8ba naive: splits large batch test into parsing and full tx handling 2021-09-15 10:36:56 -04:00
Joe Bryan
94b690cb74 naive: replace +div/+mod calls with +dvr, rewrites +ud-to-ascii 2021-09-14 22:48:06 -04:00
Joe Bryan
aa29b61da5 tiny: removes +dad 2021-09-14 22:36:32 -04:00
Joe Bryan
67310811b2 tiny: adds, jets +dvr 2021-09-14 22:36:11 -04:00
Joe Bryan
17b97de8f8 naive: updates l2 parser to use a bitwise cursor 2021-09-14 19:52:28 -04:00
Joe Bryan
87acc0bf8d tiny: jets +cut 2021-09-14 19:52:25 -04:00
Philip Monk
312d27169b
naive: specific large batch test 2021-09-13 14:24:00 -05:00
Philip Monk
94c2223bf8
naive: style 2021-09-13 14:23:21 -05:00
yosoyubik
5904c6e2c8 roller: parse cryptoSuite as cord 2021-09-13 15:14:29 +02:00
Ted Blackman
e34048a6c9
Merge pull request #5216 from urbit/lf/kiln-gall-fix-dead
kiln, gall: Fix removing agents from desk
2021-09-13 12:47:10 +03:00
Ted Blackman
19ffcd569b kiln: keep in +reset 2021-09-13 11:24:03 +03:00
Liam Fitzgerald
e6e0f47435 kiln: kill agents before merge
If a remote commit is downloaded that simultaneously removes an agent from
desk.bill but also removes the associated source files, then the commit
will fail as gall will not have received the card to kill the agent yet.
Instead, we read our foreign copy of the bill in +take-download, and
kill any necessary agents there, preventing a reload of the deleted
agent from occurring.
2021-09-13 08:41:27 +10:00
yosoyubik
cd4b8e696e json-rpc: fix malformed error response 2021-09-10 14:51:41 +02:00
Ted Blackman
7f411c5116 typo 2021-09-09 21:32:29 +03:00
Ted Blackman
e9466baf06 kiln: bump %base first 2021-09-09 21:31:44 +03:00
Ted Blackman
f148f40a34 kiln: |install to a new upstream less destructively 2021-09-09 21:17:30 +03:00
Ted Blackman
f7970cbac0 kiln: minor cleanup 2021-09-07 21:57:55 +03:00
yosoyubik
32cbb97b40 roller: add get-pending-tx rpc from l2 tx hash 2021-09-07 12:59:36 +02:00
yosoyubik
cb44dccafa azimuth-roll-rpc: update point:to-json 2021-09-07 12:58:25 +02:00
Liam Fitzgerald
39a9ed4faa hood: fix update ordering
When we receive the %mere gift from clay, the kernel has not yet been
reloaded. This means any attempts to bump desks will fail, as they will
be bumped against the old kernel. Rectifies this by continuing the %base
desk update flow in +on-load, instead of +take-merge-main. Also adds a
wef=(unit weft) to the state in order to discriminate whether or not the
kernel has just been reloaded
2021-09-07 14:37:36 +10:00
Ted Blackman
248b968550 kiln: |pause and |resume an app 2021-09-06 17:27:17 +03:00
yosoyubik
e59e41fe63 roller: simplify json for dns in get naive state 2021-09-05 12:53:01 +02:00
yosoyubik
7e0c99c980 azimuth+roller: add get-naive/predicted-state 2021-09-05 12:36:19 +02:00
Ted Blackman
f3e15396f3 %garden-dev desk; also cleaned up %base-dev 2021-09-02 00:37:56 +03:00
yosoyubik
7c70ac954b roller: add get-unspawned rpc 2021-09-01 11:01:39 +02:00
Ted Blackman
63fac6bec2 kiln: parameterize +bump on kelvin 2021-09-01 03:00:40 +03:00
Ted Blackman
e0874f22fa kiln: revise +bump 2021-09-01 02:43:25 +03:00
yosoyubik
71e2d12fde roller: return ship and time in getHistory 2021-08-31 08:41:16 +02:00
Ted Blackman
844386076f %base: symlinks; some -test tests fail 2021-08-30 20:39:37 +03:00
Ted Blackman
e2fd0b61e4 ames: |ames-prod to reset congestion control 2021-08-28 22:48:23 +03:00
Ted Blackman
91714f5579 lull,dill,gall,kiln: move %pyre to :agent:gall 2021-08-27 18:06:53 +03:00
Ted Blackman
68a80660b2 kiln: don't die so easily in +bump 2021-08-27 17:38:30 +03:00
yosoyubik
2190eea370 roller: add timestamp to roller-tx 2021-08-27 16:05:59 +02:00
yosoyubik
82f959ebd2 roller: wip point ownership tracking 2021-08-27 15:59:10 +02:00
yosoyubik
fc6f0c4678 roller: return ships as numners 2021-08-27 15:55:05 +02:00
yosoyubik
994e9f5a34 azimuth: add naive contract address used in bridge 2021-08-26 16:09:29 +02:00
Liam Fitzgerald
f85500b39d kiln: add lag scry 2021-08-24 14:09:12 +10:00
yosoyubik
580007bba8 roller: track ship ownership for address+proxy 2021-08-23 16:32:26 +02:00
Liam Fitzgerald
2d43877b15 Merge remote-tracking branch 'origin/ted/dist' into lf/kiln-json 2021-08-23 11:56:51 +10:00
Liam Fitzgerald
6a6897e009 kiln: update marks 2021-08-23 11:44:24 +10:00
yosoyubik
3774abba73 Merge remote-tracking branch 'origin/philip/naive' into naive/roller 2021-08-22 18:27:33 +02:00
yosoyubik
f87658b1ad roller: wip roller-cli client 2021-08-22 18:23:30 +02:00
Philip Monk
4a266d4b9a
naive: resolve todos 2021-08-20 18:02:27 -07:00
Philip Monk
bb3d961ced
naive: fully no-op on logs
+process-spawn uses presence or absence in the ordered map to determine
whether a ship has already been spawned.  Thus, we don't want to add
items to it except during spawn.
2021-08-20 16:49:00 -07:00
Ted Blackman
d02652d799 kiln: update %base in +bump 2021-08-20 12:45:33 +03:00
Ted Blackman
f9e1812a14 sys,gen/kiln: kelvin checking seems to work 2021-08-20 10:41:16 +03:00
Philip Monk
7f7e033004
Revert "Revert "Merge naive/aggregator into poprox/naive-tests""
This reverts commit 2f49dab586.
2021-08-19 16:09:28 -07:00
Ted Blackman
4dfc09d1a4 kiln: |suspend,|revive 2021-08-20 01:57:31 +03:00
Philip Monk
6974ab3bc7
Merge pull request #5152 from urbit/m/newcliptic
azimuth: update for latest ecliptic address
2021-08-18 22:44:19 -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
Ted Blackman
ea1d30a506 kiln: fix kelvin checking 2021-08-18 20:32:54 +03:00
Ted Blackman
6408baaa93 various: fix merge problems 2021-08-18 01:16:48 +03:00
drbeefsupreme
ac21fecf89 naive: l2 batch maker for tests 2021-08-16 13:05:29 +02:00
Philip Monk
77d5993958 naive: cleanup todos 2021-08-16 13:05:28 +02:00
Philip Monk
2f54b431a7 naive: comment 2021-08-16 13:05:28 +02:00
yosoyubik
a97668e0e8 roller: rename aggregator to roller 2021-08-16 13:01:23 +02:00
drbeefsupreme
f0f1f4db9f
Merge branch 'poprox/naive-tests' into philip/naive 2021-08-13 11:15:35 -04:00
yosoyubik
5ce8bb4951 roller: fix length in hex-encoded hash-transaction 2021-08-13 15:23:11 +02:00
yosoyubik
6aaad9bf8f roller: send unit value instead of whole unit 2021-08-12 17:36:34 +02:00
yosoyubik
e218bbdbaa roller: remove duplicate check in apply-tx 2021-08-12 10:17:42 +02:00
yosoyubik
fd474c350e naive: fix correct insert to ordered-map 2021-08-12 10:08:33 +02:00
Liam Fitzgerald
a8dfca8246 Merge remote-tracking branch 'origin/ted/dist' into lf/dist-v2 2021-08-12 11:42:39 +10:00
Ted Blackman
616ab66f26 merge master; loosen :hood's updates 2021-08-11 19:23:36 +03:00
Liam Fitzgerald
5d1eda5efd kiln: fix subscription paths, add marks 2021-08-11 14:42:51 +10:00
yosoyubik
9eb7ed7586 azimuth: add updated naive ropsten contract 2021-08-09 08:41:31 +02:00
hosted-fornet
a12c78a879 crunch: Address ixv's comments, specifically:
* Use `rap` to concatenate `cord`s rather than homegrown arm
* Replace `%graph` test fail of association with no-op instead of crash
* Re-style multi-arg runes `:*` `%:` and `:~`
2021-08-06 17:29:25 -07:00
hosted-fornet
d43c579d78 crunch: Add crunch library and generator
The crunch library and generator are tools to
export group graph data to a CSV-format file.

The purpose of crunch is to help quantify the
growth of the Urbit network.

The code added here is work done under the grant
https://urbit.org/grants/bounties/analytics-script/
2021-08-06 17:28:16 -07:00
drbeefsupreme
cd6ab7a83d
naive: l2 batch maker for tests 2021-08-06 18:18:01 -04:00
fang
010e994fb9
azimuth: update for latest ecliptic address
The static Ecliptic address in /lib/azimuth hadn't been updated to reflect the recent upgrade yet.
2021-08-06 10:48:34 +02:00
Philip Monk
6c278a9b34
naive: cleanup todos 2021-08-05 13:29:16 -04:00
yosoyubik
a221e49281 aggregator-rpc: rename getPoints -> getShips 2021-08-05 12:42:36 +02:00
yosoyubik
21775ec090 azimuth-rpc: encrypt/auth keys as hex strings 2021-08-05 12:38:07 +02:00
yosoyubik
d559ad35bc roller: clean up 2021-08-04 15:53:57 +02:00
Philip Monk
d89ab8b549
naive: comment 2021-08-03 18:45:52 -04:00
yosoyubik
31e5dd206d Merge remote-tracking branch 'origin/poprox/naive-tests' into naive/aggregator 2021-08-03 13:57:14 +02:00
Ted Blackman
4e2fd0dcd0 kiln: notify clients on desk upgrade and failure 2021-08-03 00:52:46 +03:00
Logan Allen
265db42a0a pull-hook: leave quietly, do not crash if we have already left 2021-07-29 14:18:48 +00:00
Liam Fitzgerald
ac5db5376a
Merge remote-tracking branch 'origin/la/old-subset-behavior' 2021-07-29 11:37:38 +10:00
ixv
0226bc0a7f agentio: fix bug with fact-all 2021-07-28 17:05:48 -07:00
ixv
83aaaa398a hood: start notify 2021-07-28 12:26:33 -07:00
ixv
e0358d2103 notify: style cleanup 2021-07-28 12:19:11 -07:00
Logan Allen
5114a975fe graph lib: make interface work the same as old one did 2021-07-28 13:14:44 -05:00
Liam Fitzgerald
3417927aef
aqua: address joe review 2021-07-26 15:30:23 +10:00
Ted Blackman
2507404f97 hood,desk.bill: fix boot issues 2021-07-23 14:07:58 +03:00
Matilde Park
8f27e2ae53 Merge branch 'release/next-userspace' into release/2021-7-22 2021-07-22 12:54:40 -04:00
yosoyubik
3f63aa00e6 aggregator: extract sign address from raw-tx 2021-07-22 16:46:23 +02:00
yosoyubik
875561217f aggregator: refactor +apply-effects in /lib/dice 2021-07-22 12:05:28 +02:00
yosoyubik
38d207c797 aggregator-rpc: add +unsign-transaction 2021-07-22 09:15:58 +02:00
yosoyubik
722ce969a5 aggregator: refactor ownership index logic 2021-07-22 06:34:42 +02:00
Ted Blackman
6675c3775a |nuke generator 2021-07-21 12:00:11 +03:00
Philip Monk
5996b3aa1e
Merge remote-tracking branch 'origin/master' into release/next-sys 2021-07-20 13:57:50 -04:00
Philip Monk
1d06b77a46
jael, dawn: support multikeyfile
taken from bdaad4cf84
2021-07-20 13:28:33 -04:00
Ted Blackman
143bb80035 kiln: +report-vats, fix local kelvin check 2021-07-20 18:00:07 +03:00
yosoyubik
7a56e889ae aggregator: include signing addres in submit 2021-07-20 11:22:16 +02:00
Liam Fitzgerald
342f038e23
graph-store: patch importing 2021-07-20 14:22:09 +10:00
Ted Blackman
38d6d0f4d4 gall,kiln: clean up agent stopping, starting, linking 2021-07-19 16:58:18 +03:00
Ted Blackman
cee258c9b6 spider: threads on other desks, and fixed call sites 2021-07-19 15:17:55 +03:00
Ted Blackman
6cb0afa15d kiln: fix error handling on failed merge 2021-07-19 14:02:02 +03:00
Liam Fitzgerald
092d2f30cf
Merge pull request #5030 from urbit/la/graph-scry
graph-store: rework scry format to be more succinct and consistent
2021-07-19 10:18:33 +10:00
Ted Blackman
88db811524 kiln: fix print 2021-07-18 21:27:24 +03:00
Ted Blackman
175f1f9986 kiln: basic |install works, somewhat hacky 2021-07-18 21:21:54 +03:00
Ted Blackman
db816644ab drum: actually fix ctrl-d 2021-07-18 21:21:13 +03:00
Ted Blackman
1c41b01359 %base: move landscape files out; %base boots, %landscape validates 2021-07-18 04:40:20 +03:00
Ted Blackman
4f3e99f797 clay,hood: seems to boot for real now 2021-07-17 02:54:20 +03:00
Ted Blackman
df250a0eae drum: fix broken ctrl-d 2021-07-16 21:46:12 +03:00