chore(providers): improve tx types

palladians · Oct 29, 2024 · d51e6fb · d51e6fb
1 parent 8a4fc50
commit d51e6fb
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 9 deletions.
diff --git a/packages/accounts/package.json b/packages/accounts/package.json
@@ -13,7 +13,7 @@
 	},
 	"files": ["dist"],
 	"scripts": {
-		"build": "tsup",
+		"build": "tsc --noEmit && tsup",
 		"test": "bun test",
 		"cleanup": "rimraf dist .turbo"
 	},

diff --git a/packages/connect/package.json b/packages/connect/package.json
@@ -17,7 +17,7 @@
 	},
 	"files": ["dist"],
 	"scripts": {
-		"build": "tsup",
+		"build": "tsc --noEmit && tsup",
 		"test": "bun test --rerun-each 3",
 		"cleanup": "rimraf dist .turbo"
 	},

diff --git a/packages/klesia-sdk/package.json b/packages/klesia-sdk/package.json
@@ -13,7 +13,7 @@
 	},
 	"files": ["dist"],
 	"scripts": {
-		"build": "tsup",
+		"build": "tsc --noEmit && tsup",
 		"test": "bun test --rerun-each 3",
 		"cleanup": "rimraf dist .turbo"
 	},

diff --git a/packages/providers/package.json b/packages/providers/package.json
@@ -13,7 +13,7 @@
 	},
 	"files": ["dist"],
 	"scripts": {
-		"build": "tsup",
+		"build": "tsc --noEmit && tsup",
 		"test": "bun test",
 		"cleanup": "rimraf dist .turbo"
 	},

diff --git a/packages/utils/package.json b/packages/utils/package.json
@@ -13,7 +13,7 @@
 	},
 	"files": ["dist"],
 	"scripts": {
-		"build": "tsup",
+		"build": "tsc --noEmit && tsup",
 		"test": "bun test",
 		"cleanup": "rimraf dist .turbo"
 	},

diff --git a/packages/utils/src/types.ts b/packages/utils/src/types.ts
@@ -11,6 +11,7 @@ import type {
 	TransactionBodySchema,
 	TransactionPayloadSchema,
 	TransactionReceiptSchema,
+	ZkAppCommandBodySchema,
 	ZkAppCommandPayload,
 } from "./validation";
 
@@ -24,6 +25,7 @@ export type PrivateKey = z.infer<typeof PrivateKeySchema>;
 export type TransactionBody = z.infer<typeof TransactionBodySchema>;
 export type TransactionPayload = z.infer<typeof TransactionPayloadSchema>;
 export type PartialTransaction = z.infer<typeof PartialTransactionSchema>;
+export type ZkAppCommandBody = z.infer<typeof ZkAppCommandBodySchema>;
 export type ZkAppCommandProperties = z.infer<typeof ZkAppCommandPayload>;
 
 /**

diff --git a/packages/utils/src/validation.ts b/packages/utils/src/validation.ts
@@ -55,18 +55,24 @@ export const TransactionPayloadSchema = z
 	})
 	.strict();
 
-export const PartialTransactionSchema = TransactionPayloadSchema.extend({
+export const PartialTransactionSchema = TransactionBodySchema.extend({
 	fee: z.coerce.string().optional(),
 	nonce: z.coerce.string().optional(),
 });
 
-export const ZkAppCommandPayload = z
+export const ZkAppCommandBodySchema = z
 	.object({
 		zkappCommand: JsonSchema,
 		feePayer: FeePayerSchema,
 	})
 	.strict();
 
+export const ZkAppCommandPayload = z
+	.object({
+		command: ZkAppCommandBodySchema,
+	})
+	.strict();
+
 /**
  * Return type schemas
  */
@@ -112,7 +118,7 @@ export const SignedTransactionSchema = z
 	.object({
 		signature: SignatureSchema,
 		publicKey: PublicKeySchema,
-		data: z.union([TransactionBodySchema, ZkAppCommandPayload]),
+		data: z.union([TransactionBodySchema, ZkAppCommandBodySchema]),
 	})
 	.strict();
 

diff --git a/tsconfig.json b/tsconfig.json
@@ -1,3 +1,4 @@
 {
-	"extends": "@tsconfig/bun/tsconfig.json"
+	"extends": "@tsconfig/bun/tsconfig.json",
+	"exclude": ["apps"]
 }