feat(cu): add caller to action passed from each interaction

permaweb · Oct 4, 2023 · 7d017f0 · 7d017f0
1 parent e529036
commit 7d017f0
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 15 deletions.
diff --git a/servers/cu/src/domain/client/warp-sequencer.js b/servers/cu/src/domain/client/warp-sequencer.js
@@ -1,6 +1,5 @@
 import { fromPromise, of } from 'hyper-async'
 import {
-  __,
   applySpec,
   assoc,
   complement,
@@ -256,16 +255,18 @@ export function loadInteractionsWith (
                    */
                   map(applySpec({
                     sortKey: prop('sortKey'),
-                    action: pipe(
-                      path(['tags']),
-                      // { first: tag, second: tag }
-                      reduce((a, t) => assoc(t.name, t.value, a), {}),
-                      // "{\"function\": \"balance\"}"
-                      prop('Input'),
-                      // { function: "balance" }
-                      (input) => JSON.parse(input),
-                      assoc('input', __, {})
-                    ),
+                    action: applySpec({
+                      input: pipe(
+                        path(['tags']),
+                        // { first: tag, second: tag }
+                        reduce((a, t) => assoc(t.name, t.value, a), {}),
+                        // "{\"function\": \"balance\"}"
+                        prop('Input'),
+                        // { function: "balance" }
+                        (input) => JSON.parse(input)
+                      ),
+                      caller: path(['owner', 'address'])
+                    }),
                     /**
                      * TODO: is this the right layer to be mapping this?
                      * Should it be done in BL, or is it the responsibility of the client?

diff --git a/servers/cu/src/domain/client/warp-sequencer.test.js b/servers/cu/src/domain/client/warp-sequencer.test.js
@@ -31,6 +31,7 @@ describe('warp-sequencer', () => {
       const [firstInteraction] = res
       assert.ok(firstInteraction.action)
       assert.ok(firstInteraction.action.input.function)
+      assert.ok(firstInteraction.action.caller)
       assert.ok(firstInteraction.sortKey)
       assert.ok(firstInteraction.SWGlobal)
       // attach contract meta to SWGlobal

diff --git a/servers/cu/src/domain/lib/readState/load-actions.test.js b/servers/cu/src/domain/lib/readState/load-actions.test.js
@@ -35,12 +35,12 @@ describe('load-actions', () => {
     const loadActions = loadActionsWith({
       loadInteractions: async ({ id, from, to }) => ([
         {
-          action: { input: { function: 'createOrder' } },
+          action: { input: { function: 'createOrder' }, caller: 'caller-123' },
           sortKey: 'abcd,123,fsdf',
           SWGlobal
         },
         {
-          action: { input: { function: 'createOrder' } },
+          action: { input: { function: 'createOrder' }, caller: 'caller-456' },
           sortKey: 'fdsa,456,cdskjfs',
           SWGlobal
         }
@@ -72,7 +72,7 @@ describe('load-actions', () => {
     const loadActionsNoSortKey = loadActionsWith({
       loadInteractions: async ({ id, from, to }) => ([
         {
-          action: { input: { function: 'createOrder' } },
+          action: { input: { function: 'createOrder' }, caller: 'caller-123' },
           noSortKey: 'abcd,123,fsdf'
         }
       ]),

diff --git a/servers/cu/src/domain/model.js b/servers/cu/src/domain/model.js
@@ -4,7 +4,8 @@ export const interactionSchema = z.object({
   action: z.object({
     input: z.object({
       function: z.string()
-    }).passthrough()
+    }).passthrough(),
+    caller: z.string()
   }).passthrough(),
   sortKey: z.string(),
   SWGlobal: z.object({