Skip to content

data: add Account & Wallet sur, data model doc #26

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
tomholford wants to merge 7 commits into
base: master
Choose a base branch
from
Draft

data: add Account & Wallet sur, data model doc #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c79d425
data: add Account & Wallet sur, data model doc
tomholford Jan 29, 2023
88a8a77
data: account-id.transaction + state migration
tomholford Feb 11, 2023
366b5a8
wip
tomholford Apr 23, 2023
60517ad
fix: lib serialization type errors
tomholford Apr 5, 2026
ee4770f
fix: agent type errors (migration + helper core)
tomholford Apr 5, 2026
20704b3
feat: emit subscription facts on poke
tomholford Apr 5, 2026
4756159
feat: wire frontend to wallet/account/transaction backend
tomholford Apr 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
214 changes: 133 additions & 81 deletions desk/app/hodl.hoon
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,23 +6,32 @@
:: mainly for orchestration. But, first focus on getting a working TX CRUD
:: agent before optimizing. So, one day :)
::
/+ *transaction
/+ default-agent, dbug, agentio
/+ a=account, t=transaction, w=wallet
/+ default-agent, dbug, verb
|%
+$ card card:agent:gall
:: old transaction type (state-0): no account-id field
+$ txn-0 [@t @t @da @t @t @t @ta]
+$ txns-0 (map @t txn-0)
+$ versioned-state
$% state-0
state-1
==
+$ state-0 [%0 txns=transactions]
+$ card card:agent:gall
+$ state-0 [%0 txns=txns-0]
+$ state-1 [%1 acts=accounts:a txns=transactions:t wlts=wallets:w]
--
%- agent:dbug
=| state-0
=| state-1
=* state -
::
%- agent:dbug
%+ verb & :: TODO: disable before production
^- agent:gall
::
=< :: app core
|_ =bowl:gall
+* this .
do ~(. +> bowl)
def ~(. (default-agent this %.n) bowl)
io ~(. agentio bowl)
::
++ on-init on-init:def
::
Expand All @@ -31,103 +40,146 @@
!>(state)
::
++ on-load
|= old-vase=vase
|= old-state=vase
^- (quip card _this)
`this(state !<(versioned-state old-vase))
=/ old !<(versioned-state old-state)
|^
?- -.old
%1 `this(state old)
%0 `this(state (state-0-to-1 old))
==
++ state-0-to-1
|= zer=state-0
^- state-1
[%1 *accounts:a (transactions-0-to-1 txns.zer) *wallets:w]
++ transactions-0-to-1
|= txns=txns-0
^- transactions:t
%- ~(run by txns)
|= old=txn-0
^- txn:t
=+ [id cid dat not amt cb typ]=old
[id cid dat not amt cb typ '']
--
::
++ on-poke
|= [=mark =vase]
^- (quip card _this)
|^
?> (team:title our.bowl src.bowl)
?. ?=(%hodl-action mark) (on-poke:def mark vase)
=/ act !<(action vase)
=. state (poke-action act)
:_ this
~[(fact:io hodl-update+!>(`update`[act]) ~[/updates])]
::
++ poke-action
|= act=action
^- _state
?- -.act
%add
?< (~(has by txns) id.act)
=/ txn=txn
:* id=id.act
coin-id=coin-id.act
date=date.act
note=note.act
amount=amount.act
cost-basis=cost-basis.act
type=type.act
==
state(txns (~(put by txns) id.act txn))
::
%edit
?> (~(has by txns) id.act)
=/ txn=txn
:* id=id.act
coin-id=coin-id.act
date=date.act
note=note.act
amount=amount.act
cost-basis=cost-basis.act
type=type.act
==
state(txns (~(put by txns) id.act txn)) :: TODO: should all fields be editable? probably not id
::
%del
?> (~(has by txns) id.act)
state(txns (~(del by txns) id.act))
=^ cards state
?+ mark (on-poke:def mark vase)
%account-action (poke-account-action:do !<(action:a vase)) :: TODO do these action need to be namesspaced?
%transaction-action (poke-transaction-action:do !<(action:t vase))
%wallet-action (poke-wallet-action:do !<(action:w vase))
==
--
[cards this]
::
++ on-watch
|= =path
^- (quip card _this)
?> (team:title our.bowl src.bowl)
?+ path (on-watch:def path)
[%updates ~] `this
[%updates ~] `this
:: TODO: should the updates be scoped to each model?
:: ?: ?=([%updates ~] path)
:: :_ this
:: [%give %fact ~ %hodl-update !>(update)]~
:: (on-watch:def path)
==
::
:: ++ on-peek on-peek:def
++ on-peek
|= =path
^- (unit (unit cage))
?> (team:title our.bowl src.bowl)
=/ now=@ (unm:chrono:userlib now.bowl)
?+ path (on-peek:def path)
[%x %transactions *]
:: ~& t.path
:: (on-peek:def path)
?+ t.t.path (on-peek:def path)
[%all ~]
:^ ~ ~ %hodl-update
!> ^- update
[%txns txns]
:: [%txns (tap:t-orm txns)]
:: [now %txns (tap:t-orm txns)]
==
:: [%before @ @ ~]
:: =/ before=@ (rash i.t.t.t.path dem)
:: =/ max=@ (rash i.t.t.t.t.path dem)
:: :^ ~ ~ %hodl-update
:: !> ^- update
:: [now %txns (tab:t-orm txns `before max)]
::
:: [%between @ @ ~]
:: =/ start=@
:: =+ (rash i.t.t.t.path dem)
:: ?:(=(0 -) - (sub - 1))
:: =/ end=@ (add 1 (rash i.t.t.t.t.path dem))
:: :^ ~ ~ %hodl-update
:: !> ^- update
:: [now %txns (tap:t-orm (lot:t-orm txns `end `start))]
:: ==
?+ path (on-peek:def path)
[%x %accounts @t ~] ``noun+!>((~(get by acts) i.t.t.path))
[%x %accounts ~] ``noun+!>(acts)
[%x %transactions @t ~] ``noun+!>((~(get by txns) i.t.t.path))
[%x %transactions ~] ``noun+!>(txns)
[%x %wallets @t ~] ``noun+!>((~(get by wlts) i.t.t.path))
[%x %wallets ~] ``noun+!>(wlts)
==
::
++ on-leave on-leave:def
++ on-agent on-agent:def
++ on-arvo on-arvo:def
++ on-fail on-fail:def
--
:: helper core
|_ =bowl:gall
++ poke-account-action
|= act=action:a
^- (quip card _state)
?- -.act
%add
?< (~(has by acts) id.act)
=/ =acct:a
:* id=id.act
wallet-id=wallet-id.act
name=name.act
note=note.act
==
:_ state(acts (~(put by acts) id.act acct))
~[[%give %fact ~[/updates] %account-update !>(`update:a`[%add acct])]]
::
%edit
?> (~(has by acts) id.act)
=/ =acct:a
:* id=id.act
wallet-id=wallet-id.act
name=name.act
note=note.act
==
:_ state(acts (~(put by acts) id.act acct))
~[[%give %fact ~[/updates] %account-update !>(`update:a`[%edit acct])]]
::
%del
?> (~(has by acts) id.act)
:_ state(acts (~(del by acts) id.act))
~[[%give %fact ~[/updates] %account-update !>(`update:a`[%del id.act])]]
==
::
++ poke-transaction-action
|= act=action:t
^- (quip card _state)
?- -.act
%add
=/ =txn:t txn.act
?< (~(has by txns) id.txn)
:_ state(txns (~(put by txns) id.txn txn))
~[[%give %fact ~[/updates] %transaction-update !>(`update:t`[%add txn])]]
::
%edit
=/ =txn:t txn.act
?> (~(has by txns) id.txn)
:_ state(txns (~(put by txns) id.txn txn))
~[[%give %fact ~[/updates] %transaction-update !>(`update:t`[%edit txn])]]
::
%del
?> (~(has by txns) id.act)
:_ state(txns (~(del by txns) id.act))
~[[%give %fact ~[/updates] %transaction-update !>(`update:t`[%del id.act])]]
==
::
++ poke-wallet-action
|= act=action:w
^- (quip card _state)
?- -.act
%add
=/ =wllt:w wllt.act
?< (~(has by wlts) id.wllt)
:_ state(wlts (~(put by wlts) id.wllt wllt))
~[[%give %fact ~[/updates] %wallet-update !>(`update:w`[%add wllt])]]
::
%edit
=/ =wllt:w wllt.act
?> (~(has by wlts) id.wllt)
:_ state(wlts (~(put by wlts) id.wllt wllt))
~[[%give %fact ~[/updates] %wallet-update !>(`update:w`[%edit wllt])]]
::
%del
?> (~(has by wlts) id.act)
:_ state(wlts (~(del by wlts) id.act))
~[[%give %fact ~[/updates] %wallet-update !>(`update:w`[%del id.act])]]
==
--
42 changes: 42 additions & 0 deletions desk/lib/account.hoon
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
/- *account
|%
++ dejs-action
=, dejs:format
|= jon=json
^- action
%. jon
%- of
:~ [%add (ot ~[id+so wallet-id+so name+so note+so])]
[%edit (ot ~[id+so wallet-id+so name+so note+so])]
[%del (ot ~[id+so])]
==
++ enjs-update
=, enjs:format
|= upd=update
^- json
|^
?- -.upd
%accts (acts +.upd)
%add (acjs +.upd)
%edit (acjs +.upd)
%del s+id.upd
==
++ acts
|= ud=[=accounts]
^- json
%- pairs
%+ turn ~(tap by accounts.ud)
|= act=[=id =acct]
^- (pair @t json)
[id.act (acjs acct.act)]
++ acjs
|= [id=@t wallet-id=@t name=@t note=@t]
^- json
%- pairs
:~ id/s+id
wallet-id/s+wallet-id
name/s+name
note/s+note
==
--
--
55 changes: 26 additions & 29 deletions desk/lib/transaction.hoon
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
[%del del]
==
++ add
^- $-(json add:^action)
%- ot
:~ id+so
coin-id+so
Expand All @@ -20,9 +19,9 @@
amount+so
cost-basis+so
type+so
account-id+so
==
++ edit
^- $-(json edit:^action)
%- ot
:~ id+so
coin-id+so
Expand All @@ -31,9 +30,9 @@
amount+so
cost-basis+so
type+so
account-id+so
==
++ del
^- $-(json del:^action)
%- ot
:~ id+so
==
Expand All @@ -44,37 +43,35 @@
++ update
|= upd=^update
^- json
%+ frond -.upd
?- -.upd
%txns
%- pairs
%+ turn ~(tap by txns.upd)
|= [=id =txn]
^- (pair @t json)
[id (txjs txn)]
%add
%- pairs
:~ add/(txjs +.upd)
==
%edit
%- pairs
:~ edit/(txjs +.upd)
==
%del
%- pairs
:~ del/s+id.upd
==
%txns (txns txns.upd)
%add (txjs txn.upd)
%edit (txjs txn.upd)
%del s+id.upd
==
::
++ txns
|= txns=transactions
^- json
%- pairs
%+ turn ~(tap by txns)
|= t=[=id =txn]
^- (pair @t json)
[id.t (txjs txn.t)]
::
++ txjs
|= txn
|= t=txn
^- json
%- pairs
:~ id/s+id
coin-id/s+coin-id
date/(time date)
note/s+note
amount/s+amount
cost-basis/s+cost-basis
type/s+type
:~ id/s+id.t
coin-id/s+coin-id.t
date/(time date.t)
note/s+note.t
amount/s+amount.t
cost-basis/s+cost-basis.t
type/s+type.t
account-id/s+account-id.t
==
--
--
Loading
Loading