tapimo 0.19.0 → 0.20.0

package/src/apps/data/routes/earn.local.test.ts

@@ -33,10 +33,7 @@ type HistoricalRoute = {
   router: typeof stack.router
 }
 let historical: HistoricalRoute
-const key = {
-  ...TestApp.key,
-  scopes: ['data:read', `zone:${runtime.zone.chainId}:read`],
-} satisfies TestApp.kvStore.Key
+const key = TestApp.zoneReader({ ...TestApp.key, scopes: ['data:read'] }, [runtime.zone.chainId])
 const unrelatedKey = {
   ...TestApp.key,
   id: 'key_earn_local_unrelated',
@@ -46,6 +43,7 @@ const unrelatedKey = {
 
 async function createPositionApp(options: createPositionApp.Options = {}) {
   const db = TestApp.database()
+  await TestApp.delegateZone(db, { chainIds: [runtime.zone.chainId, runtime.zone.chainId + 1] })
   await EarnVaults.upsert(db, {
     chainId: runtime.chainId,
     description: 'Disposable local Earn vault.',
@@ -389,18 +387,13 @@ test.runIf(runtime.mode === 'localnet')(
   120_000,
 )
 
-test.runIf(runtime.mode === 'localnet')('scopes verified Zone route capabilities', async () => {
+test.runIf(runtime.mode === 'localnet')('scopes vault Zone route capabilities', async () => {
   const otherZoneId = runtime.zone.chainId + 1
-  const scopedKey = {
-    ...key,
-    scopes: ['data:read', `zone:${otherZoneId}:read`, `zone:${runtime.zone.chainId}:read`],
-  } satisfies TestApp.kvStore.Key
-  const unrelatedKey = {
-    ...TestApp.key,
-    id: 'key_earn_local_other_zone',
-    scopes: ['data:read', `zone:${otherZoneId}:read`],
-    token: 'secret_earn_local_other_zone',
-  } satisfies TestApp.kvStore.Key
+  const scopedKey = { ...key, zoneTags: [otherZoneId, runtime.zone.chainId] } satisfies TestApp.kvStore.Key // prettier-ignore
+  const unrelatedKey = TestApp.zoneReader(
+    { ...TestApp.key, id: 'key_earn_local_other_zone', scopes: ['data:read'], token: 'secret_earn_local_other_zone' }, // prettier-ignore
+    [otherZoneId],
+  )
   const writeOnlyKey = {
     ...TestApp.key,
     id: 'key_earn_local_write_zone',
@@ -410,8 +403,9 @@ test.runIf(runtime.mode === 'localnet')('scopes verified Zone route capabilities
   const wildcardKey = {
     ...TestApp.key,
     id: 'key_earn_local_all_zones',
-    scopes: ['*'],
+    scopes: ['*', 'zone:read'],
     token: 'secret_earn_local_all_zones',
+    zoneTags: [otherZoneId, runtime.zone.chainId],
   } satisfies TestApp.kvStore.Key
   const { app, entries } = await createPositionApp({
     keys: [scopedKey, unrelatedKey, wildcardKey, writeOnlyKey],
@@ -423,18 +417,17 @@ test.runIf(runtime.mode === 'localnet')('scopes verified Zone route capabilities
       },
     ],
   })
-  const base = `/v1/earn/vaults/verified?chainId=${runtime.chainId}`
+  const base = `/v1/earn/vaults/${stack.vault}?chainId=${runtime.chainId}`
   const included = `${base}&include=capabilities,zone,zones`
-  const filtered = `${included}&capability=privateRouting`
   // Fill the query-credential cache entry before checking callers without its Zone scope.
-  const scopedResponse = await app.request(`${filtered}&key=${scopedKey.token}`)
+  const scopedResponse = await app.request(`${included}&key=${scopedKey.token}`)
   const [defaultResponse, unrelatedResponse, publicResponse, wildcardResponse, writeOnlyResponse] =
     await Promise.all([
       app.request(base, { headers: { 'tempo-api-key': scopedKey.token } }),
       app.request(included, { headers: { 'tempo-api-key': unrelatedKey.token } }),
-      app.request(filtered),
-      app.request(filtered, { headers: { 'tempo-api-key': wildcardKey.token } }),
-      app.request(filtered, { headers: { 'tempo-api-key': writeOnlyKey.token } }),
+      app.request(included),
+      app.request(included, { headers: { 'tempo-api-key': wildcardKey.token } }),
+      app.request(included, { headers: { 'tempo-api-key': writeOnlyKey.token } }),
     ])
   const responses = [
     defaultResponse,
@@ -450,23 +443,23 @@ test.runIf(runtime.mode === 'localnet')('scopes verified Zone route capabilities
     )
   const [defaultBody, scopedBody, unrelatedBody, publicBody, wildcardBody, writeOnlyBody] =
     await Promise.all([
-      TestApp.json(defaultResponse, Earn.schema.getVerifiedEarnVaults.Response),
-      TestApp.json(scopedResponse, Earn.schema.getVerifiedEarnVaults.Response),
-      TestApp.json(unrelatedResponse, Earn.schema.getVerifiedEarnVaults.Response),
-      TestApp.json(publicResponse, Earn.schema.getVerifiedEarnVaults.Response),
-      TestApp.json(wildcardResponse, Earn.schema.getVerifiedEarnVaults.Response),
-      TestApp.json(writeOnlyResponse, Earn.schema.getVerifiedEarnVaults.Response),
+      TestApp.json(defaultResponse, Earn.schema.getEarnVault.Response),
+      TestApp.json(scopedResponse, Earn.schema.getEarnVault.Response),
+      TestApp.json(unrelatedResponse, Earn.schema.getEarnVault.Response),
+      TestApp.json(publicResponse, Earn.schema.getEarnVault.Response),
+      TestApp.json(wildcardResponse, Earn.schema.getEarnVault.Response),
+      TestApp.json(writeOnlyResponse, Earn.schema.getEarnVault.Response),
     ])
-  expect(defaultBody.data[0]).not.toHaveProperty('zone')
-  expect(defaultBody.data[0]).not.toHaveProperty('zones')
+  expect(defaultBody).not.toHaveProperty('zone')
+  expect(defaultBody).not.toHaveProperty('zones')
   for (const body of [unrelatedBody, publicBody])
-    expect(body.data[0]).toMatchObject({
+    expect(body).toMatchObject({
       capabilities: { privateRouting: true, routerSwaps: true },
       zone: null,
       zones: [],
     })
-  expect(writeOnlyBody.data[0]).toMatchObject({ zone: null, zones: [] })
-  const vault = scopedBody.data[0]
+  expect(writeOnlyBody).toMatchObject({ zone: null, zones: [] })
+  const vault = scopedBody
   expect(vault?.capabilities).toMatchObject({ privateRouting: true, routerSwaps: true })
   expect(vault?.zones).toHaveLength(1)
   expect(vault?.zones?.[0]).toMatchObject({
@@ -484,7 +477,7 @@ test.runIf(runtime.mode === 'localnet')('scopes verified Zone route capabilities
         }
       : null,
   )
-  expect(wildcardBody.data[0]).toStrictEqual(vault)
+  expect(wildcardBody).toStrictEqual(vault)
 })
 
 test.runIf(runtime.mode === 'localnet')('imports a verified parent checkpoint', async () => {