From f6d77e8a7f8de0439f39028ef34023f516e2accd Mon Sep 17 00:00:00 2001 From: Hunter Miller Date: Mon, 16 Sep 2024 10:17:07 -0500 Subject: [PATCH 1/2] reel: migrate old tokens and update link flow to match --- desk/app/reel.hoon | 28 ++++++++++++++++++++++------ 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/desk/app/reel.hoon b/desk/app/reel.hoon index 507a505e..63d0cad8 100644 --- a/desk/app/reel.hoon +++ b/desk/app/reel.hoon @@ -54,6 +54,7 @@ open-describes=(set token:reel) stable-id=(map cord token:reel) == +++ flag ;~((glue fas) ;~(pfix sig fed:ag) sym) :: url with old style token ++ url-for-token |= [vic=cord token=cord] @@ -79,7 +80,20 @@ =/ old !<(versioned-state old-state) ?- -.old %4 - `this(state old) + =. state old + =^ new-md stable-id + %+ roll + ~(tap by our-metadata) + |= [[=token:reel =metadata:reel] [md=_our-metadata id=_stable-id]] + ?^ (slaw %uv token) [md id] + ?^ (rush token flag) + :- md + ?: (~(has by id) token) id + (~(put by id) token token) + =/ new (rap 3 (scot %p our.bowl) '/' token ~) + :- (~(put by md) new metadata) + (~(put by id) new new) + `this(our-metadata new-md) %3 `this(state [%4 vic.old civ.old our-metadata.old outstanding-pokes.old ~ ~]) %2 @@ -174,18 +188,20 @@ %reel-want-token-link =+ !<(=token:reel vase) :_ this + =/ full-token + ?^ (rush token flag) token + (rap 3 (scot %p our.bowl) '/' token ~) =/ result=(unit [cord cord]) - ?. (~(has by our-metadata) token) `[token ''] - `[token (url-for-token vic token)] + ?. (~(has by our-metadata) full-token) `[full-token ''] + `[full-token (url-for-token vic full-token)] ~[[%pass [%token-link-want token ~] %agent [src dap]:bowl %poke %reel-give-token-link !>(result)]] %reel-give-token-link =+ !<(result=(unit [cord cord]) vase) ?~ result `this :_ this =/ [token=cord url=cord] u.result - ?: =('' url) - ~[[%give %fact ~[[%token-link (scot %p src.bowl) token ~]] %json !>(~)]] - ~[[%give %fact ~[[%token-link (scot %p src.bowl) token ~]] %json !>(s+url)]] + =/ path (stab (cat 3 '/token-link/' token)) + ~[[%give %fact ~[path] %json !>(?:(=('' url) ~ s+url))]] == :: ++ on-agent From b64c2879164a337a40614d310269350384eb24ef Mon Sep 17 00:00:00 2001 From: Hunter Miller Date: Mon, 16 Sep 2024 10:52:44 -0500 Subject: [PATCH 2/2] ops: bump version --- desk/desk.docket-0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/desk/desk.docket-0 b/desk/desk.docket-0 index df65e62e..4bc4c7d0 100644 --- a/desk/desk.docket-0 +++ b/desk/desk.docket-0 @@ -4,7 +4,7 @@ glob-http+['https://bootstrap.urbit.org/glob-0v7.the2a.smdhg.89k09.6ar0t.gb5te.glob' 0v7.the2a.smdhg.89k09.6ar0t.gb5te] ::glob-ames+~zod^0v0 base+'landscape' - version+[1 26 0] + version+[1 26 1] website+'https://tlon.io' license+'MIT' ==