ilyakooo0/urbit
1
0
Fork 0
mirror of https://github.com/ilyakooo0/urbit.git synced 2024-12-03 02:35:52 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into m/simpler-login

Browse Source
This commit is contained in:
Pyry Kovanen 2023-11-13 18:35:14 +02:00 committed by GitHub
commit 3e2fb835bd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
16 changed files with 52 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/arvo/app/acme.hoon
View File

@ -346,6 +346,7 @@
++ on-poke
|= [=mark =vase]
^- (quip card _this)
?> (team:title [our src]:bowl)
=^ cards state
?+ mark (on-poke:def mark vase)
%acme-order (poke-acme-order:ac !<((set turf) vase))

1
pkg/arvo/app/aqua.hoon
View File

@ -80,6 +80,7 @@
::
++ on-poke
|= [=mark =vase]
?> (team:title [our src]:bowl)
^- step:agent:gall
=^ cards state
?+ mark ~|([%aqua-bad-mark mark] !!)

2
pkg/arvo/app/azimuth-rpc.hoon
View File

@ -52,7 +52,7 @@
(handle-http-request id req)
::
%azimuth-action
?> (team:title our.bowl src.bowl)
?> (team:title [our src]:bowl)
=+ !<([%disconnect bind=binding:eyre] vase)
~& >>> "disconnecting at {<bind>}"
:_ this

1
pkg/arvo/app/azimuth-tracker.hoon
View File

@ -121,6 +121,7 @@
::
++ on-poke
|= [=mark =vase]
?> (team:title [our src]:bowl)
?. ?=(%azimuth-tracker-poke mark)
(on-poke:def mark vase)
=+ !<(poke=poke-data vase)

1
pkg/arvo/app/azimuth.hoon
View File

@ -208,6 +208,7 @@
++ on-poke
|= [=mark =vase]
^- (quip card _this)
?> (team:title [our src]:bowl)
?: =(%noun mark)
?+ q.vase !!
[%refresh-rate @]

1
pkg/arvo/app/claz.hoon
View File

@ -31,6 +31,7 @@
++ on-poke
|= [=mark =vase]
^- (quip card _this)
?> (team:title [our src]:bowl)
?. ?=(%noun mark) [~ this]
?^ in-progress
~& %still-running-please-try-again-later

1
pkg/arvo/app/dojo.hoon
View File

@ -1748,6 +1748,7 @@
++ on-poke
|= [=mark =vase]
^- (quip card:agent:gall _..on-init)
?> (team:title [our src]:hid)
=^ moves state
^- (quip card:agent:gall house)
?+ mark ~|([%dojo-poke-bad-mark mark] !!)

1
pkg/arvo/app/eth-sender.hoon
View File

@ -58,6 +58,7 @@
++ on-poke
|= [=mark =vase]
^- (quip card _this)
?> (team:title [our src]:bowl)
?. ?=(%noun mark) [~ this]
=/ =command !<(command vase)
?- -.command

1
pkg/arvo/app/eth-watcher.hoon
View File

@ -327,6 +327,7 @@
::
++ on-poke
|= [=mark =vase]
?> (team:title [our src]:bowl)
?: ?=(%noun mark)
~& state
`this

1
pkg/arvo/app/herm.hoon
View File

@ -81,6 +81,7 @@
++ on-poke
|= [=mark =vase]
^- (quip card:agent:gall _this)
?> (team:title [our src]:bowl)
:_ this
:_ ~
?+ mark ~|([%unexpected-mark mark] !!)

1
pkg/arvo/app/language-server.hoon
View File

@ -77,6 +77,7 @@
^+ on-poke:*agent:gall
|= [=mark =vase]
^- (quip card _this)
?> (team:title [our src]:bowl)
=^ cards state
?+ mark (on-poke:def mark vase)
%language-server-rpc-notification

1
pkg/arvo/app/lens.hoon
View File

@ -50,6 +50,7 @@
^- (quip card:agent:gall _this)
::
?: &(?=(%noun mark) ?=(%cancel q.vase))
?> (team:title [our src]:bowl)
~& %lens-cancel
[~ this(job.state ~)]
::

1
pkg/arvo/app/spider.hoon
View File

@ -214,6 +214,7 @@
~/ %on-poke
|= [=mark =vase]
^- (quip card _this)
?> (team:title [our src]:bowl)
?: ?=(%spider-kill mark)
(on-load on-save)
=^ cards state

1
pkg/arvo/app/test.hoon
View File

@ -25,6 +25,7 @@
++ on-poke
|= [=mark =vase]
^- [(list card) _this]
?> (team:title [our src]:bowl)
|^
=+ !<(=test vase)
?- test

1
pkg/arvo/app/time.hoon
View File

@ -15,6 +15,7 @@
++ on-load _on-init
++ on-poke
|= [=mark =vase]
?> (team:title [our src]:bowl)
?+ mark !!
%noun :_ this
[%pass /(scot %da now.bowl) %arvo %b %wait `@da`+(now.bowl)]~

54
pkg/arvo/sys/vane/ames.hoon
View File

@ -559,7 +559,7 @@
:: dead: dead flow consolidation timer and recork timer, if set
::
+$ ames-state
$+ ames-state
$+ ames-state-17
$: peers=(map ship ship-state)
=unix=duct
=life
@ -1338,6 +1338,7 @@
[%15 ames-state-15]
[%16 ames-state-16]
[%17 ^ames-state]
[%18 ^ames-state]
==
::
|= [now=@da eny=@ rof=roof]
@ -1560,6 +1561,13 @@
state=_ames-state.adult-gate
==
[%adult state=_ames-state.adult-gate]
== ==
$: %18
$% $: %larva
events=(qeu queued-event)
state=_ames-state.adult-gate
==
[%adult state=_ames-state.adult-gate]
== == ==
|^ ?- old
[%4 %adult *]
@ -1701,12 +1709,23 @@
=. queued-events (event-16-to-17 events.old)
larval-gate
::
[%17 %adult *] (load:adult-core %17 state.old)
[%17 %adult *]
=. cached-state `[%17 state.old]
~> %slog.0^leaf/"ames: larva reload"
larval-gate
::
[%17 %larva *]
~> %slog.1^leaf/"ames: larva: load"
=. cached-state `[%17 state.old]
=. queued-events events.old
=. adult-gate (load:adult-core %17 state.old)
larval-gate
::
[%18 %adult *] (load:adult-core %18 state.old)
::
[%18 %larva *]
~> %slog.1^leaf/"ames: larva: load"
=. queued-events events.old
=. adult-gate (load:adult-core %18 state.old)
larval-gate
==
::
@ -1797,7 +1816,14 @@
(rof ~ /ames %bx [[our %$ da+now] /debug/timers])
|=([@da =duct] ?=([[%ames %recork *] *] duct))
::
?> ?=(%17 -.u.cached-state)
=^ moz u.cached-state
?. ?=(%17 -.u.cached-state) [~ u.cached-state]
:_ [%18 +.u.cached-state]
~> %slog.0^leaf/"ames: fetching our public keys"
^- (list move)
[[[/ames]~ %pass /public-keys %j %public-keys [n=our ~ ~]] moz]
::
?> ?=(%18 -.u.cached-state)
=. ames-state.adult-gate +.u.cached-state
[moz larval-core(cached-state ~)]
--
@ -2736,10 +2762,6 @@
++ on-publ-sponsor
|= [=ship sponsor=(unit ship)]
^+ event-core
::
?: =(our ship)
event-core
::
?~ sponsor
%- (slog leaf+"ames: {(scow %p ship)} lost sponsor, ignoring" ~)
event-core
@ -2763,9 +2785,8 @@
::
=+ ^- [=ship =point] i.points
::
?: =(our ship)
=. rift.ames-state rift.point
$(points t.points)
=? rift.ames-state =(our ship)
rift.point
::
?. (~(has by keys.point) life.point)
$(points t.points)
@ -2831,9 +2852,8 @@
++ on-publ-rift
|= [=ship =rift]
^+ event-core
?: =(our ship)
=. rift.ames-state rift
event-core
=? rift.ames-state =(our ship)
rift
?~ ship-state=(~(get by peers.ames-state) ship)
:: print error here? %rift was probably called before %keys
::
@ -5054,15 +5074,15 @@
[moves ames-gate]
:: +stay: extract state before reload
::
++ stay [%17 %adult ames-state]
++ stay [%18 %adult ames-state]
:: +load: load in old state after reload
::
++ load
=< |= $= old-state
$% [%17 ^ames-state]
$% [%18 ^ames-state]
==
^+ ames-gate
?> ?=(%17 -.old-state)
?> ?=(%18 -.old-state)
ames-gate(ames-state +.old-state)
:: all state transitions are called from larval ames
::