@0xtorch/core 0.0.14 → 0.0.16

package/actions/schemas/crossActionBundle.ts

@@ -1,7 +1,19 @@
 import { z } from 'zod'
-import { accountActionSchema } from './action'
+import {
+  accountActionBridgeFromSchema,
+  accountActionBridgeToSchema,
+  accountActionCrossReplaceSchema,
+} from './crossReplace'
+import { accountActionCrossTradeSchema } from './crossTrade'
 
 export const crossActionBundleSchema = z.object({
   id: z.string(),
-  actions: z.array(accountActionSchema),
+  actions: z.array(
+    z.union([
+      accountActionBridgeFromSchema,
+      accountActionBridgeToSchema,
+      accountActionCrossReplaceSchema,
+      accountActionCrossTradeSchema,
+    ]),
+  ),
 })

package/actions/types/action.ts

@@ -1,5 +1,11 @@
 import type { z } from 'zod'
-import type { accountActionSchema, normalActionSchema } from '../schemas'
+import type { Nft } from '../../assets'
+import type {
+  accountActionSchema,
+  crossTypeSchema,
+  normalActionSchema,
+} from '../schemas'
+import type { Transfer } from './default'
 
 export type NormalAction = z.infer<typeof normalActionSchema>
 
@@ -10,3 +16,22 @@ export type ActionType = NormalAction['action']
 export type AccountActionType = AccountAction['action']
 
 export type Evidence = AccountAction['evidence']
+
+export type BaseNormalAction = Omit<
+  NormalAction,
+  'type' | 'loanId' | 'crossId' | 'crossType' | 'target' | 'transfers'
+> & {
+  loanId: string | undefined
+  crossId: string | undefined
+  crossType: z.infer<typeof crossTypeSchema> | undefined
+  target: Nft | undefined
+  transfers: readonly Transfer[]
+}
+
+export type BaseAccountAction = Omit<AccountAction, 'type' | 'transfers'> & {
+  loanId: string | undefined
+  crossId: string | undefined
+  crossType: z.infer<typeof crossTypeSchema> | undefined
+  target: Nft | undefined
+  transfers: readonly Transfer[]
+}

package/actions/types/index.ts

@@ -2,6 +2,8 @@ export type {
   AccountAction,
   AccountActionType,
   ActionType,
+  BaseAccountAction,
+  BaseNormalAction,
   Evidence,
   NormalAction,
 } from './action'