mirror of
https://github.com/urbit/shrub.git
synced 2024-12-18 15:55:00 +03:00
Merge branch 'next/arvo' into m/scry-vane
This commit is contained in:
fang
commit
3cb3421657
6
.gitattributes
vendored
6
.gitattributes
vendored
@ -8,4 +8,8 @@ pkg/arvo/tmp/landscape.jam filter=lfs diff=lfs merge=lfs -text
|
||||
pkg/arvo/tmp/base.jam filter=lfs diff=lfs merge=lfs -text
|
||||
pkg/arvo/tmp/bitcoin.jam filter=lfs diff=lfs merge=lfs -text
|
||||
pkg/arvo/tmp/webterm.jam filter=lfs diff=lfs merge=lfs -text
|
||||
|
||||
*.hoon text eol=lf
|
||||
*.kelvin text eol=lf
|
||||
*.bill text eol=lf
|
||||
*.docket-0 text eol=lf
|
||||
*.ship text eol=lf
|
||||
|
||||
@ -200,6 +200,9 @@
|
||||
=/ contracts (get-contracts network)
|
||||
?+ -.call ecliptic:contracts
|
||||
%send-point delegated-sending:contracts
|
||||
::
|
||||
?(%approve-batch-transfer %transfer-batch %withdraw)
|
||||
linear-star-release:contracts
|
||||
==
|
||||
::
|
||||
++ deed
|
||||
@ -379,7 +382,7 @@
|
||||
?> =(%king (clan:title s))
|
||||
(~(put in ss) (^sein:title s))
|
||||
|-
|
||||
?~ parents txs
|
||||
?~ parents !! ::txs
|
||||
=. txs
|
||||
%+ do-here ecliptic:mainnet-contracts
|
||||
(set-spawn-proxy:dat i.parents lockup-contract)
|
||||
@ -394,15 +397,18 @@
|
||||
=. txs
|
||||
%+ do-here ecliptic:mainnet-contracts
|
||||
(set-transfer-proxy:dat i.what lockup-contract)
|
||||
=. txs
|
||||
%+ do-here lockup-contract
|
||||
(deposit:dat to i.what)
|
||||
$(what t.what)
|
||||
==
|
||||
:: depositing
|
||||
::
|
||||
|-
|
||||
?~ what txs
|
||||
=. txs
|
||||
%+ do-here lockup-contract
|
||||
(deposit:dat to i.what)
|
||||
:: =. txs
|
||||
:: %+ do-here lockup-contract
|
||||
:: (deposit:dat to i.what)
|
||||
$(what t.what)
|
||||
++ do-here
|
||||
|= [contract=address dat=tape]
|
||||
|
||||
@ -902,6 +902,9 @@
|
||||
%dv (dy-sing hand+q.bil %a p.bil (snoc q.bil %hoon))
|
||||
%ge (dy-run-generator (dy-cage p.p.p.bil) q.p.bil)
|
||||
%sa
|
||||
=/ has-mark .?((get-fit:clay he-beak %mar p.bil))
|
||||
?. has-mark
|
||||
(he-diff(poy ~) %tan leaf+"dojo: %{(trip p.bil)} missing" ~)
|
||||
=+ .^(=dais:clay cb+(en-beam he-beak /[p.bil]))
|
||||
(dy-hand p.bil *vale:dais)
|
||||
::
|
||||
@ -910,8 +913,12 @@
|
||||
=/ has-mark .?((get-fit:clay he-beak %mar p.bil))
|
||||
?. has-mark :: yolo
|
||||
(dy-hand p.bil q.cag)
|
||||
=+ .^(=tube:clay cc+(en-beam he-beak /[p.cag]/[p.bil]))
|
||||
(dy-hand p.bil (tube q.cag))
|
||||
=/ res
|
||||
=+ .^(=tube:clay cc+(en-beam he-beak /[p.cag]/[p.bil]))
|
||||
(mule |.((tube q.cag)))
|
||||
?: ?=(%| -.res)
|
||||
(he-diff(poy ~) %tan leaf+"dojo: %as %{(trip p.bil)} failed" p.res)
|
||||
(dy-hand p.bil p.res)
|
||||
::
|
||||
%do
|
||||
=/ gat (dy-eval p.bil)
|
||||
|
||||
@ -42,8 +42,14 @@
|
||||
%adopt (adopt:dat +.call)
|
||||
%start-document-poll (start-document-poll:dat +.call)
|
||||
%cast-document-vote (cast-document-vote:dat +.call)
|
||||
%start-upgrade-poll (start-upgrade-poll:dat +.call)
|
||||
%cast-upgrade-vote (cast-upgrade-vote:dat +.call)
|
||||
::
|
||||
%send-point (send-point:dat +.call)
|
||||
::
|
||||
%approve-batch-transfer (approve-batch-transfer:dat +.call)
|
||||
%transfer-batch (transfer-batch:dat +.call)
|
||||
%withdraw (withdraw:dat +.call)
|
||||
==
|
||||
::
|
||||
+$ call-data call-data:rpc
|
||||
@ -67,12 +73,18 @@
|
||||
++ adopt (enc adopt:cal)
|
||||
++ start-document-poll (enc start-document-poll:cal)
|
||||
++ cast-document-vote (enc cast-document-vote:cal)
|
||||
++ start-upgrade-poll (enc start-upgrade-poll:cal)
|
||||
++ cast-upgrade-vote (enc cast-upgrade-vote:cal)
|
||||
::
|
||||
++ register-linear (enc register-linear:cal)
|
||||
++ register-conditional (enc register-conditional:cal)
|
||||
++ deposit (enc deposit:cal)
|
||||
::
|
||||
++ send-point (enc send-point:cal)
|
||||
::
|
||||
++ approve-batch-transfer (enc approve-batch-transfer:cal)
|
||||
++ transfer-batch (enc transfer-batch:cal)
|
||||
++ withdraw (enc withdraw:cal)
|
||||
--
|
||||
::
|
||||
::TODO lib
|
||||
@ -170,6 +182,25 @@
|
||||
[%bool support]
|
||||
==
|
||||
::
|
||||
++ start-upgrade-poll
|
||||
|= [gal=ship =address]
|
||||
^- call-data
|
||||
?> =(%czar (clan:title gal))
|
||||
:- 'startUpgradePoll(uint8,address)'
|
||||
:~ [%uint `@`gal]
|
||||
[%address address]
|
||||
==
|
||||
::
|
||||
++ cast-upgrade-vote
|
||||
|= [gal=ship =address support=?]
|
||||
^- call-data
|
||||
?> =(%czar (clan:title gal))
|
||||
:- 'castUpgradeVote(uint8,address,bool)'
|
||||
:~ [%uint `@`gal]
|
||||
[%address address]
|
||||
[%bool support]
|
||||
==
|
||||
::
|
||||
::
|
||||
++ set-dns-domains
|
||||
|= [pri=tape sec=tape ter=tape]
|
||||
@ -252,6 +283,27 @@
|
||||
[%address to]
|
||||
==
|
||||
::
|
||||
++ approve-batch-transfer
|
||||
|= to=address
|
||||
^- call-data
|
||||
:- 'approveBatchTransfer(address)'
|
||||
:~ [%address to]
|
||||
==
|
||||
::
|
||||
++ transfer-batch
|
||||
|= from=address
|
||||
^- call-data
|
||||
:- 'transferBatch(address)'
|
||||
:~ [%address from]
|
||||
==
|
||||
::
|
||||
++ withdraw
|
||||
|= to=address
|
||||
^- call-data
|
||||
:- 'withdraw(address)'
|
||||
:~ [%address to]
|
||||
==
|
||||
::
|
||||
:: read calls
|
||||
::
|
||||
++ rights
|
||||
|
||||
@ -66,8 +66,14 @@
|
||||
[%adopt who=ship]
|
||||
[%start-document-poll gal=ship hash=@]
|
||||
[%cast-document-vote gal=ship hash=@ vote=?]
|
||||
[%start-upgrade-poll gal=ship =address]
|
||||
[%cast-upgrade-vote gal=ship =address vote=?]
|
||||
::
|
||||
[%send-point as=ship point=ship to=address]
|
||||
::
|
||||
[%approve-batch-transfer to=address]
|
||||
[%transfer-batch from=address]
|
||||
[%withdraw to=address]
|
||||
==
|
||||
::
|
||||
++ prep-result
|
||||
|
||||
@ -48,7 +48,7 @@
|
||||
+$ dock (pair @p term)
|
||||
+$ gang (unit (set ship))
|
||||
+$ mark @tas
|
||||
+$ mein [our=ship now=@da eny=@uvJ]
|
||||
+$ mien [our=ship now=@da eny=@uvJ]
|
||||
++ omen |$ [a] (pair path (cask a))
|
||||
+$ ship @p
|
||||
+$ sink (trel bone ship path)
|
||||
@ -214,7 +214,7 @@
|
||||
:: zen: Outside knowledge
|
||||
:: mod: internal modules
|
||||
::
|
||||
mein
|
||||
mien
|
||||
$= fad
|
||||
$: :: lac: not verbose
|
||||
::
|
||||
@ -1294,31 +1294,30 @@
|
||||
^- mass
|
||||
=; sam=(list mass)
|
||||
:+ %arvo %|
|
||||
:~ hoon+&+pit
|
||||
zuse+&+zus.mod
|
||||
:~ :+ %hoon %|
|
||||
:~ one+&+..bloq
|
||||
two+&+..turn
|
||||
tri+&+..year
|
||||
qua+&+..sane
|
||||
pen+&+..ride
|
||||
==
|
||||
hex+&+..part
|
||||
pit+&+pit
|
||||
lull+|+[dot+&+q typ+&+p ~]:lul.mod
|
||||
zuse+|+[dot+&+q typ+&+p ~]:zus.mod
|
||||
vane+|+sam
|
||||
==
|
||||
::
|
||||
=/ von
|
||||
%+ turn
|
||||
(sort ~(tap by van.mod) |=([[a=@tas *] [b=@tas *]] (aor a b)))
|
||||
::
|
||||
:~ :+ %reports %|
|
||||
=/ bem=beam [[our %home da+now] /whey] ::TODO %base?
|
||||
%+ turn von
|
||||
|= [nam=term =vane]
|
||||
=/ met (peek [~ ~] nam bem)
|
||||
~| mass/nam
|
||||
?> &(?=(^ met) ?=(^ u.met)) :: XX make optional
|
||||
nam^|+;;((list mass) q.q.u.u.met)
|
||||
::
|
||||
:+ %caches %|
|
||||
%+ turn von
|
||||
|=([nam=term =vane] nam^&+worm.vane)
|
||||
::
|
||||
:+ %dregs %|
|
||||
%+ turn von
|
||||
|=([nam=term =vane] nam^&+vase.vane)
|
||||
==
|
||||
=/ bem=beam [[our %home da+now] /whey] ::TODO %base?
|
||||
|= [nam=term =vane]
|
||||
=; mas=(list mass)
|
||||
nam^|+(welp mas [dot+&+q.vase typ+&+p.vase sac+&+worm ~]:vane)
|
||||
?~ met=(peek [~ ~] nam bem) ~
|
||||
?~ u.met ~
|
||||
~| mass+nam
|
||||
;;((list mass) q.q.u.u.met)
|
||||
:: +peek: read from the entire namespace
|
||||
::
|
||||
++ peek
|
||||
|
||||
@ -4422,7 +4422,7 @@
|
||||
:: :: ++chrd:de-xml:html
|
||||
++ chrd :: character data
|
||||
%+ cook |=(a=tape ^-(mars ;/(a)))
|
||||
(plus ;~(less doq ;~(pose (just `@`10) escp)))
|
||||
(plus ;~(pose (just `@`10) escp))
|
||||
:: :: ++comt:de-xml:html
|
||||
++ comt :: comments
|
||||
=- (ifix [(jest '<!--') (jest '-->')] (star -))
|
||||
|
||||
@ -87,7 +87,7 @@
|
||||
0x223c.067f.8cf2.8ae1.73ee.5caf.ea60.ca44.c335.fecb
|
||||
::
|
||||
++ ecliptic
|
||||
0xa5b6.109a.d2d3.5191.b3bc.32c0.0e45.26be.56fe.321f
|
||||
0x33ee.cbf9.0847.8c10.6146.26a9.d304.bfe1.8b78.dd73
|
||||
::
|
||||
++ linear-star-release
|
||||
0x86cd.9cd0.992f.0423.1751.e376.1de4.5cec.ea5d.1801
|
||||
|
||||
@ -349,7 +349,7 @@
|
||||
++ on-peek
|
||||
|= =path
|
||||
^- (unit (unit cage))
|
||||
?. =(/x/dbug/state path) ~
|
||||
?. =(/x/dbug/state path) (on-peek:og path)
|
||||
``noun+(slop on-save:og !>(shoe=state))
|
||||
::
|
||||
++ on-agent
|
||||
|
||||
Loading…
Reference in New Issue
Block a user