Merge pull request #5436 from urbit/m/claz-lockup-txs

claz: better linear lockup ops support

pkg/arvo/app/claz.hoon

@@ -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]

pkg/arvo/lib/claz.hoon

@@ -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

pkg/arvo/sur/claz.hoon

@@ -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