on master help sign in
Merge branch 'master' into mp/markdoc
fe472f7Matilde Park
content/applications/~livdel-binmun-lomder-librun/ballot.mdnew file+11
@@ -0,0 +1,11 @@
1++++
2+title = "ballot"
3+shortcode = "~livdel-binmun-lomder-librun/ballot"
4+license = "MIT"
5+image = "https://lomder-librun.sfo3.digitaloceanspaces.com/tiles/ballot-app-tile.svg"
6+bgColor = "#cebef0"
7+developer = "~lomder-librun"
8+website = "https://www.holium.com"
9++++
10+
11+An app that allows you to vote with other ships.
content/docs/development/environment.md+2−2
@@ -201,7 +201,7 @@ compatible. You can copy it across from the `%base` desk, or just run the
201following in the terminal from within the desk directory:
201following in the terminal from within the desk directory:
202
202
203```sh
203```sh
204−echo "[%zuse 419]" > sys.kelvin
204+echo "[%zuse 418]" > sys.kelvin
205```
205```
206
206
207The other `mark` files can just be copied across from the `%base` desk.
207The other `mark` files can just be copied across from the `%base` desk.
@@ -271,7 +271,7 @@ and copy the actual files.
271Now you can just add a `sys.kelvin` file:
271Now you can just add a `sys.kelvin` file:
272
272
273```
273```
274−echo "[%zuse 419]" > mydesk/sys.kelvin
274+echo "[%zuse 418]" > mydesk/sys.kelvin
275```
275```
276
276
277And you'll be able to mount the desk with `|commit %mydesk`.
277And you'll be able to mount the desk with `|commit %mydesk`.
content/docs/hoon/hoon-school/type-polymorphism.md+1−1
@@ -443,7 +443,7 @@ nest-fail
443
443
444The first cast goes through because the two gates have the same sample type. The second cast fails because the right-hand gate has a more specific sample type than the left-hand gate does. If you're casting for a gate that accepts any cell, `^`, it's because we want to be able to pass any cell to it. A gate that is only designed for pairs of atoms, `[@ @]`, can't handle all such cases, naturally. The third cast goes through because the right-hand gate sample type is broader than the left-hand gate sample type. A gate that can take any noun as its sample, `*`, works just fine if we choose only to pass it cells, `^`.
444The first cast goes through because the two gates have the same sample type. The second cast fails because the right-hand gate has a more specific sample type than the left-hand gate does. If you're casting for a gate that accepts any cell, `^`, it's because we want to be able to pass any cell to it. A gate that is only designed for pairs of atoms, `[@ @]`, can't handle all such cases, naturally. The third cast goes through because the right-hand gate sample type is broader than the left-hand gate sample type. A gate that can take any noun as its sample, `*`, works just fine if we choose only to pass it cells, `^`.
445
445
446−We mentioned previously that an iron core has a write-only sample and an opaque core. Let's prove it.
446+We mentioned previously that an iron core has a write-only sample and an opaque context. Let's prove it.
447
447
448Let's define a trivial gate with a context of `[g=22 h=44 .]`, convert it to iron with `^|`, and bind it to `iron-gate` in the dojo:
448Let's define a trivial gate with a context of `[g=22 h=44 .]`, convert it to iron with `^|`, and bind it to `iron-gate` in the dojo:
449
449
content/docs/hoon/reference/stdlib/3a.md+2−1
@@ -381,7 +381,8 @@ The signed-integer type is represented by the `@s` aura. Positive integers are
381prepended with a `--`, and negative integers are prepended with a `-`. For
381prepended with a `--`, and negative integers are prepended with a `-`. For
382example, `--1` represents positive one, and `-1` represents negative one.
382example, `--1` represents positive one, and `-1` represents negative one.
383
383
384+[ZigZag encoding](https://developers.google.com/protocol-buffers/docs/encoding?hl=en#signed-ints)
384−Zig zag encoding is used to convert atoms to signed integers. Positive signed
385+is used to convert atoms to signed integers. Positive signed
385integers correspond to even atoms of twice their absolute value, and negative
386integers correspond to even atoms of twice their absolute value, and negative
386signed integers correspond to odd atoms of twice their absolute value minus
387signed integers correspond to odd atoms of twice their absolute value minus
387one. For example:
388one. For example:
content/docs/userspace/dist/dist.md+1−1
@@ -37,7 +37,7 @@ For those of you familiar with the old `%glob` and `%file-server` agents, they h
37Desks still contain helper files in `/lib` and `/sur`, generators in `/gen`, marks in `/mar`, threads in `/ted`, tests in `/tests`, and agents in `/app`. In addition, desks now also contain these files:
37Desks still contain helper files in `/lib` and `/sur`, generators in `/gen`, marks in `/mar`, threads in `/ted`, tests in `/tests`, and agents in `/app`. In addition, desks now also contain these files:
38
38
39```
39```
40−/sys/kelvin :: Kernel kelvin, e.g. [%zuse 419]
40+/sys/kelvin :: Kernel kelvin, e.g. [%zuse 418]
41/desk/bill :: (optional, read by Kiln) list of agents to run
41/desk/bill :: (optional, read by Kiln) list of agents to run
42/desk/docket-0 :: (optional, read by Docket) app metadata
42/desk/docket-0 :: (optional, read by Docket) app metadata
43/desk/ship :: (optional, read by Docket) ship of original desk publisher, e.g. ~zod
43/desk/ship :: (optional, read by Docket) ship of original desk publisher, e.g. ~zod
content/docs/userspace/dist/guide.md+2−2
@@ -44,9 +44,9 @@ lib mar sur
44Our desk must include a `sys.kelvin` file which specifies the kernel version it's compatible with. Let's create that:
44Our desk must include a `sys.kelvin` file which specifies the kernel version it's compatible with. Let's create that:
45
45
46```
46```
47−[user@host hello]$ echo "[%zuse 419]" > sys.kelvin
47+[user@host hello]$ echo "[%zuse 418]" > sys.kelvin
48[user@host hello]$ cat sys.kelvin
48[user@host hello]$ cat sys.kelvin
49−[%zuse 419]
49+[%zuse 418]
50```
50```
51
51
52### `desk.ship`
52### `desk.ship`
content/docs/userspace/dist/tools.md+2−2
@@ -46,7 +46,7 @@ None.
46```
46```
47> +vats
47> +vats
48%base
48%base
49− /sys/kelvin: [%zuse 419]
49+ /sys/kelvin: [%zuse 418]
50 base hash: ~
50 base hash: ~
51 %cz hash: 0v6.2nqmu.oqm24.ighl6.n0gp9.s8res.feql1.dl8ap.isli3.jk0hu.acrd2
51 %cz hash: 0v6.2nqmu.oqm24.ighl6.n0gp9.s8res.feql1.dl8ap.isli3.jk0hu.acrd2
52 app status: running
52 app status: running
@@ -60,7 +60,7 @@ None.
60 pending updates: ~
60 pending updates: ~
61::
61::
62%garden
62%garden
63− /sys/kelvin: [%zuse 419]
63+ /sys/kelvin: [%zuse 418]
64 base hash: ~
64 base hash: ~
65 %cz hash: 0v1e.2h7hs.elq3g.1sdt7.qfga6.ganga.7p95j.aog44.8p5fe.kpr6v.7ai82
65 %cz hash: 0v1e.2h7hs.elq3g.1sdt7.qfga6.ganga.7p95j.aog44.8p5fe.kpr6v.7ai82
66 app status: running
66 app status: running
content/docs/userspace/full-stack/9-desk.md+1−1
@@ -43,7 +43,7 @@ We only have one agent to start, so `desk.bill` is very simple:
43Likewise, `sys.kelvin` just contains:
43Likewise, `sys.kelvin` just contains:
44
44
45```
45```
46−[%zuse 419]
46+[%zuse 418]
47```
47```
48
48
49The `desk.docket-0` file is slightly more complicated:
49The `desk.docket-0` file is slightly more complicated:
content/events/2022-06-16-developer-call-urbits-new-terminal-stack-tlon.mdnew file+24
@@ -0,0 +1,24 @@
1++++
2+title = "Developer Call: Urbit’s new Terminal Stack"
3+starts = "2022-06-16T09:00:00"
4+ends = "2022-06-16T10:30:00"
5+timezone = "America/Los_Angeles"
6+location = "Online Event"
7+image = ""
8+registration_url = "https://www.meetup.com/urbit-sf/events/286426447/"
9+description = ""
10+dark = false
11+youtube = "E-6E-l1SxFw"
12+
13+[[hosts]]
14+name = "Neal Davis"
15+patp = "~lagrev-nocfep"
16+
17+[[guests]]
18+patp = "~palfun-foslup"
19+
20++++
21+
22+This time Tlon’s ~palfun-foslup will join Neal Davis to discuss the Urbit’s current terminal stack and the improvements he is building for it. Multiple sessions and apparently a mouse has been spotted in the upcoming release. All in all some very exciting terminal improvements are coming up shortly. For the long-term ~palfun-foslup is building a native UI which he will describe as well. Be sure to join the hangout after the Developer Call to ask ~palfun-foslup everything you want to know.
23+
24+~palfun-foslup has been part of Tlon for over 4 years and works in the Infrastructure team. In the broader community he is known for the largest Urbit app suite located at ~paldev.
content/grants/apprenticeship-studio-collections.mdnew file+53
@@ -0,0 +1,53 @@
1++++
2+title = "~tirrel Studio Collections"
3+date = "2022-05-18"
4+
5+[taxonomies]
6+grant_type = [ "Apprenticeship" ]
7+grant_category = [ "App Dev", "Other" ]
8+
9+[extra]
10+image = ""
11+description = "Extend ~tirrel's studio app content offering to include groups collections"
12+reward = "1 star"
13+mentor = "~novlud-padtyv"
14+assignee = ""
15+completed = false
16+canceled = false
17++++
18+
19+### Project Description
20+
21+Currently %studio allows publishing groups notebook content to the web, but we would like to extend that to all the content types groups offer, with collections being the next logical step. This work will involve userspace and frontend development. It will be a solo project with mentor support.
22+
23+We desire to use collections to build out 2 frontend layouts: a gallery view and
24+link-tree-esque "about me" page.
25+
26+## Deliverables
27+
28+A number of backend and frontend changes would have to be made to %studio.
29+- The pipe app will have to be modified to enable an additional flow type
30+ specific to collections, as well as whatever necessary state changes are
31+ required to support that
32+- Two instances of a new template type would have to be developed, a gallery and
33+ an "about me" page
34+- Frontend changes will have to be made according to designs we will specify, to
35+ expose the new functionality to %studio users
36+
37+### Prerequisites
38+
39+- We require apprentices to either have some experience with hoon, or at least have completed hoon school.
40+- React/JS experience
41+
42+### Educational Outcomes for the Apprentice
43+
44+By the end of the apprenticeship, the apprentice will have experience working with a mature codebase in hoon, and will have gained the practical skills necessary to analyze all the architecture and introduce large scale changes.
45+
46+### Responsibilities of the Mentor
47+
48+The mentor will be responsible for directing the apprentice in what changes to make, at whatever level of granularity is necessary to make progress. This can range from pair-programming where the mentor just directly tells the apprentice what to write, to guidance and suggestions for larger scale changes that the apprentice will complete on their own. As the apprenticeship progresses, the idea is to move increasingly toward the latter approach.
49+
50+### Duration and Compensation
51+
52+Expected duration is two months.
53+1 star paid at completion of apprenticeship
content/grants/apprenticeship-studio-email.md+5−1
@@ -9,7 +9,7 @@ grant_category = [ "App Dev", "Other" ]
9[extra]
9[extra]
10image = ""
10image = ""
11description = "Build out email capabilities of ~tirrel's Studio app"
11description = "Build out email capabilities of ~tirrel's Studio app"
12−reward = "$8000 in WSTR"
12+reward = "1 star"
13mentor = "~novlud-padtyv"
13mentor = "~novlud-padtyv"
14assignee = "~rivmud-fabwen"
14assignee = "~rivmud-fabwen"
15completed = false
15completed = false
@@ -33,3 +33,7 @@ At ~10 hours per week I estimate it would take about 2 months.
33- A PR against this repo for the backend changes: https://github.com/tirrel-corp/studio
33- A PR against this repo for the backend changes: https://github.com/tirrel-corp/studio
34
34
35- A PR against this repo for the frontend changes: https://github.com/tirrel-corp/studio-ui
35- A PR against this repo for the frontend changes: https://github.com/tirrel-corp/studio-ui
36+
37+## Compensation
38+
39+1 star upon successful completion of the apprenticeship
content/grants/books.md+4−4
@@ -9,7 +9,7 @@ grant_category = [ "App Dev" ]
9[extra]
9[extra]
10image = ""
10image = ""
11description = "Books is an application for managing your crypto wallets, transactions, and counterparties. It allows you to add your wallet and others' wallets, track balances and transactions, and add private annotations to all of the above."
11description = "Books is an application for managing your crypto wallets, transactions, and counterparties. It allows you to add your wallet and others' wallets, track balances and transactions, and add private annotations to all of the above."
12−reward = "$45,000-$65,000 in WSTR"
12+reward = "5-7 stars"
13assignee = "Quartus"
13assignee = "Quartus"
14id = ""
14id = ""
15completed = false
15completed = false
@@ -106,8 +106,8 @@ project (see [Future Work](#future-work)) will be given priority.
106
106
107## Schedule
107## Schedule
108
108
109−The schedule is simple. If you can satisfactorily complete the above [user stories](#user-stories) within two months of acceptance, the reward is $65,000 in WSTR.
109+The schedule is simple. If you can satisfactorily complete the above [user stories](#user-stories) within two months of acceptance, the reward is 7 stars.
110
110
111−If completed within three months, the reward is $55,000.
111+If completed within three months, the reward is 6 stars.
112
112
113−If completed within five months, the reward is $45,000.
113+If completed within five months, the reward is 5 stars.
content/grants/native-planet-2.md+3−3
@@ -9,7 +9,7 @@ grant_category = [ "Other" ]
9[extra]
9[extra]
10image = ""
10image = ""
11description = "Native Planet - A domestic hosting solution for Urbit"
11description = "Native Planet - A domestic hosting solution for Urbit"
12−reward = "$50,000 in WSTR"
12+reward = "6 stars"
13assignee = "~dalhec-banler"
13assignee = "~dalhec-banler"
14champion = "~poldec-tonteg"
14champion = "~poldec-tonteg"
15completed = false
15completed = false
@@ -34,7 +34,7 @@ The final version of the Native Planet will extend the proof-of-concept prototyp
34
34
35Expected Completion: 30 May 2022
35Expected Completion: 30 May 2022
36
36
37−Payment: $25,000 WSTR
37+Payment: 3 stars
38
38
39Anchor Server
39Anchor Server
40
40
@@ -64,7 +64,7 @@ Onboard screen UI
64
64
65Expected Completion: 30 July, 2022
65Expected Completion: 30 July, 2022
66
66
67−Payment: $25,000 WSTR
67+Payment: 3 stars
68
68
69Production UX
69Production UX
70
70
content/grants/planet-sales.md+1−1
@@ -10,7 +10,7 @@ description = "Layer 2 Planet Sales via Urbit"
10reward = "6 stars"
10reward = "6 stars"
11assignee = "~tacryt-socryp"
11assignee = "~tacryt-socryp"
12grant_id = "P0071"
12grant_id = "P0071"
13−completed = false
13+completed = true
14canceled = false
14canceled = false
15link = ""
15link = ""
16+++
16+++
content/grants/symmetric-routing.md+1−1
@@ -11,7 +11,7 @@ image = ""
11description = "Change Urbit's peer discovery, routing, and packet forwarding to use symmetric routing"
11description = "Change Urbit's peer discovery, routing, and packet forwarding to use symmetric routing"
12reward = "1 star"
12reward = "1 star"
13mentor = "~rovnys-ricfer"
13mentor = "~rovnys-ricfer"
14−assignee = ""
14+assignee = "~novned-tidsyl"
15completed = false
15completed = false
16canceled = false
16canceled = false
17work_request_link = "https://airtable.com/shr4qt9t9kz7RaOIa?prefill_Grant+ID=A0162&prefill_Grant+Name=Symmetric%20Routing"
17work_request_link = "https://airtable.com/shr4qt9t9kz7RaOIa?prefill_Grant+ID=A0162&prefill_Grant+Name=Symmetric%20Routing"
content/groups/~famreb-todmec/the-combine-public.mdnew file+13
@@ -0,0 +1,13 @@
1++++
2+title = "The Combine Public"
3+shortcode = "~famreb-todmec/the-combine-public"
4+type = "Public"
5+tile = "https://friends.sfo2.digitaloceanspaces.com/famreb-todmec/2022.5.27..17.10.10-logo-no-word.png"
6+participant_range = "10+"
7++++
8+
9+The Combine is a DAO built on Urbit; by Urbit maximalists for Urbit maximalists. We fund companies, DAOs and cliques that create tools to make the Urbit universe a better place to live and work.
10+
11+Join this public group to learn more about what we're up to, ask questions about funding or just spitball ideas.
12+
13+You can learn more at our [site](https://the-combine.org) or by following us on twitter at [@TheCombineDAO](https://twitter.com/TheCombineDAO)
content/groups/~tirrel/the-marketplace.mdnew file+13
@@ -0,0 +1,13 @@
1++++
2+title = "The Marketplace"
3+shortcode = "~tirrel/the-marketplace"
4+type = "Public"
5+tile = "https://snipboard.io/F5ubXp.jpg"
6+participant_range = "1000"
7++++
8+
9+Join The Marketplace, featuring The Pit, Urbit's first open-outcry market for trading Stars and Galaxies.
10+
11+Also popular is Star Squawk, Urbit most active discussion group for address space markets.
12+
13+Additionally, we have channels dedicated to tracking down rare Planets and trader reputations. Scammers get added to the Naughty List, and will be censured!
vercel.json+4
@@ -24,6 +24,10 @@
24 "destination": "/groups/~ladtem-filmyr/urbit-ny-week",
24 "destination": "/groups/~ladtem-filmyr/urbit-ny-week",
25 "permanent": true
25 "permanent": true
26 },
26 },
27+ {
28+ "source": "/applications/~lomder-librun/ballot",
29+ "destination": "/applications/~livdel-binmun-lomder-librun/ballot"
30+ },
27 {
31 {
28 "source": "/grants/grant-submission-guide",
32 "source": "/grants/grant-submission-guide",
29 "destination": "/grants/proposals",
33 "destination": "/grants/proposals",