feat(providers): yet another refactor

palladians · Oct 27, 2024 · 3749b61 · 3749b61
1 parent 90c0a38
commit 3749b61
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 21 deletions.
diff --git a/apps/klesia/src/schema.ts b/apps/klesia/src/schema.ts
@@ -1,4 +1,4 @@
-import { PublicKeySchema, TransactionPayload } from "@mina-js/utils";
+import { PublicKeySchema, TransactionBodySchema } from "@mina-js/utils";
 import { z } from "zod";
 import { SendZkappInput } from "./zkapp";
 
@@ -12,7 +12,7 @@ export const SignatureSchema = z.union([
 	z.object({ field: z.string(), scalar: z.string() }),
 ]);
 export const SendTransactionBodySchema = z.object({
-	input: TransactionPayload,
+	input: TransactionBodySchema,
 	signature: SignatureSchema,
 });
 export const SendZkAppBodySchema = z.object({

diff --git a/packages/accounts/src/validation.ts b/packages/accounts/src/validation.ts
@@ -1,4 +1,4 @@
-import { FieldSchema, TransactionBody } from "@mina-js/utils";
+import { FieldSchema, TransactionBodySchema } from "@mina-js/utils";
 import { z } from "zod";
 
 export const SignFieldsParamsSchema = z
@@ -21,6 +21,6 @@ export const CreateNullifierParamsSchema = z
 
 export const SignTransactionParamsSchema = z
 	.object({
-		transaction: TransactionBody,
+		transaction: TransactionBodySchema,
 	})
 	.strict();
diff --git a/packages/connect/src/client.ts b/packages/connect/src/client.ts
@@ -7,7 +7,7 @@ import type {
 	SignTransaction,
 } from "@mina-js/accounts";
 import { createClient } from "@mina-js/klesia-sdk";
-import type { PartiallyFormedTransactionProperties } from "@mina-js/utils";
+import type { PartialTransaction } from "@mina-js/utils";
 import { match } from "ts-pattern";
 import { createStore } from "./store";
 
@@ -117,9 +117,7 @@ export const createWalletClient = ({
 		if (account.type !== "local") throw new Error("Account type not supported");
 		return account.createNullifier(params);
 	};
-	const prepareTransactionRequest = async (
-		transaction: PartiallyFormedTransactionProperties,
-	) => {
+	const prepareTransactionRequest = async (transaction: PartialTransaction) => {
 		let fee = transaction.fee;
 		let nonce = transaction.nonce;
 		if (!nonce) {

diff --git a/packages/providers/src/validation.ts b/packages/providers/src/validation.ts
@@ -7,7 +7,7 @@ import {
 	SignedFieldsSchema,
 	SignedMessageSchema,
 	SignedTransactionSchema,
-	TransactionPayload,
+	TransactionPayloadSchema,
 	TransactionReceiptSchema,
 } from "@mina-js/utils";
 import { z } from "zod";
@@ -57,7 +57,7 @@ export const SignFieldsRequestParamsSchema = RequestWithContext.extend({
 }).strict();
 export const SignTransactionRequestParamsSchema = RequestWithContext.extend({
 	method: z.literal("mina_signTransaction"),
-	params: z.array(z.union([TransactionPayload, ZkAppCommandPayload])),
+	params: z.array(z.union([TransactionPayloadSchema, ZkAppCommandPayload])),
 }).strict();
 export const SendTransactionRequestParamsSchema = RequestWithContext.extend({
 	method: z.literal("mina_sendTransaction"),

diff --git a/packages/utils/src/types.ts b/packages/utils/src/types.ts
@@ -2,13 +2,14 @@ import type { z } from "zod";
 import type {
 	LiteralSchema,
 	NullifierSchema,
-	PartiallyFormedTransactionPayload,
+	PartialTransactionSchema,
 	PrivateKeySchema,
 	PublicKeySchema,
 	SignedFieldsSchema,
 	SignedMessageSchema,
 	SignedTransactionSchema,
-	TransactionPayload,
+	TransactionBodySchema,
+	TransactionPayloadSchema,
 	TransactionReceiptSchema,
 	ZkAppCommandPayload,
 } from "./validation";
@@ -20,10 +21,9 @@ export type Literal = z.infer<typeof LiteralSchema>;
 export type Json = Literal | { [key: string]: Json } | Json[];
 export type PublicKey = z.infer<typeof PublicKeySchema>;
 export type PrivateKey = z.infer<typeof PrivateKeySchema>;
-export type TransactionProperties = z.infer<typeof TransactionPayload>;
-export type PartiallyFormedTransactionProperties = z.infer<
-	typeof PartiallyFormedTransactionPayload
->;
+export type TransactionBody = z.infer<typeof TransactionBodySchema>;
+export type TransactionPayload = z.infer<typeof TransactionPayloadSchema>;
+export type PartialTransaction = z.infer<typeof PartialTransactionSchema>;
 export type ZkAppCommandProperties = z.infer<typeof ZkAppCommandPayload>;
 
 /**

diff --git a/packages/utils/src/validation.ts b/packages/utils/src/validation.ts
@@ -37,7 +37,7 @@ export const FeePayerSchema = z
 	})
 	.strict();
 
-export const TransactionBody = z
+export const TransactionBodySchema = z
 	.object({
 		from: PublicKeySchema,
 		to: PublicKeySchema,
@@ -49,13 +49,13 @@ export const TransactionBody = z
 	})
 	.strict();
 
-export const TransactionPayload = z
+export const TransactionPayloadSchema = z
 	.object({
-		transaction: TransactionBody,
+		transaction: TransactionBodySchema,
 	})
 	.strict();
 
-export const PartiallyFormedTransactionPayload = TransactionPayload.extend({
+export const PartialTransactionSchema = TransactionPayloadSchema.extend({
 	fee: z.coerce.string().optional(),
 	nonce: z.coerce.string().optional(),
 });
@@ -112,7 +112,7 @@ export const SignedTransactionSchema = z
 	.object({
 		signature: SignatureSchema,
 		publicKey: PublicKeySchema,
-		data: TransactionBody,
+		data: TransactionBodySchema,
 	})
 	.strict();