feat: add zkApp command schema (#13)

* feat: add zkApp command schema

* feat: add converters for zkappCommand between Node API and mina-signer formats

Author: DeMonkeyCoder

apps/docs/src/components/test-zkapp.tsx

@@ -201,10 +201,9 @@ export const TestZkApp = () => {
 				},
 			},
 			feePayer: {
-				feePayer: accounts[0],
+				publicKey: accounts[0],
 				fee: transactionBody.fee,
 				nonce: transactionBody.nonce,
-				memo: transactionBody.memo,
 			},
 		};
 		const { result } = await provider.request({

apps/docs/src/pages/connect/wallet-interface.mdx

@@ -126,12 +126,24 @@ const { result } = await provider.request<'mina_signTransaction'>({
   method: 'mina_signTransaction',
   params: [{
     command: {
-      zkappCommand: {},
+      zkappCommand: {
+        accountUpdates: [],
+        memo: 'E4YM2vTHhWEg66xpj52JErHUBU4pZ1yageL4TVDDpTTSsv8mK6YaH',
+        feePayer: {
+          body: {
+            publicKey: 'B62qmWKtvNQTtUqo1LxfEEDLyWMg59cp6U7c4uDC7aqgaCEijSc3Hx5',
+            fee: '100000000',
+            validUntil: '100000',
+            nonce: '1',
+          },
+          authorization: '',
+        },
+      },
       feePayer: {
-        feePayer: 'B62qmWKtvNQTtUqo1LxfEEDLyWMg59cp6U7c4uDC7aqgaCEijSc3Hx5',
+        publicKey: 'B62qmWKtvNQTtUqo1LxfEEDLyWMg59cp6U7c4uDC7aqgaCEijSc3Hx5',
         fee: '100000000',
+        validUntil: '100000',
         nonce: '1',
-        memo: 'Hello, Mina!',
       }
     }
   }]
@@ -175,7 +187,23 @@ const store = createStore()
 const { provider } = store.getProviders()[0]
 const { result } = await provider.request<'mina_sendTransaction'>({
   method: 'mina_sendTransaction',
-  params: [{ input: {}, signature: { field: 'xyz', scalar: 'xyz' } }, 'payment']
+  params: [
+    {
+      input: {
+        from: "B62qmWKtvNQTtUqo1LxfEEDLyWMg59cp6U7c4uDC7aqgaCEijSc3Hx5",
+        to: "B62qnVUL6A53E4ZaGd3qbTr6RCtEZYTu3kTijVrrquNpPo4d3MuJ3nb",
+		amount: "3000000000",
+		fee: "100000000",
+		memo: "Hello from MinaJS!",
+		nonce: "0",
+	  },
+      signature: {
+        field: 'xyz',
+        scalar: 'xyz'
+      }
+    },
+    'payment'
+  ]
 })
 ```
 

bun.lockb

@@ -59,26 +59,25 @@ exports[`signs a zkapp command 1`] = `
   "data": {
     "feePayer": {
       "fee": "100000000",
-      "feePayer": "B62qmWKtvNQTtUqo1LxfEEDLyWMg59cp6U7c4uDC7aqgaCEijSc3Hx5",
-      "memo": "Test",
       "nonce": "0",
-      "validUntil": "null",
+      "publicKey": "B62qmWKtvNQTtUqo1LxfEEDLyWMg59cp6U7c4uDC7aqgaCEijSc3Hx5",
+      "validUntil": null,
     },
     "zkappCommand": {
       "accountUpdates": [],
       "feePayer": {
-        "authorization": "7mXWqNfmqMTM5uSCS2xLfsRBLTjGZKTtpEakdsrdQz1EUgYXogSvKxxtfGbBkqQ2mZRMA3uPAM8riaCF56pkqpZBLr2kNBLa",
+        "authorization": "7mWy2iLxnZaVmGtCAwVs1EQu8TCdjbSQjQVvUtDFmB9zaiYVet61cN7jDnd5BBqUupQup159H32CV8xAdRc4By5fXLT1T1qi",
         "body": {
           "fee": "100000000",
           "nonce": "0",
           "publicKey": "B62qmWKtvNQTtUqo1LxfEEDLyWMg59cp6U7c4uDC7aqgaCEijSc3Hx5",
           "validUntil": null,
         },
       },
-      "memo": "E4YVT4x3A9rUhmjkjGn8ZYBLZn7zK4cfvnMtBYZFdWkg37n2s3nrP",
+      "memo": "E4YM2vTHhWEg66xpj52JErHUBU4pZ1yageL4TVDDpTTSsv8mK6YaH",
     },
   },
   "publicKey": "B62qmWKtvNQTtUqo1LxfEEDLyWMg59cp6U7c4uDC7aqgaCEijSc3Hx5",
-  "signature": "7mXWqNfmqMTM5uSCS2xLfsRBLTjGZKTtpEakdsrdQz1EUgYXogSvKxxtfGbBkqQ2mZRMA3uPAM8riaCF56pkqpZBLr2kNBLa",
+  "signature": "7mWy2iLxnZaVmGtCAwVs1EQu8TCdjbSQjQVvUtDFmB9zaiYVet61cN7jDnd5BBqUupQup159H32CV8xAdRc4By5fXLT1T1qi",
 }
 `;

packages/accounts/src/accounts/__snapshots__/private-key-to-account.spec.ts.snap

@@ -37,28 +37,28 @@ it("signs a zkapp command", async () => {
 	const account = privateKeyToAccount({
 		privateKey: Test.accounts[0].privateKey,
 	});
-	const command = {
-		zkappCommand: {
-			accountUpdates: [],
-			memo: "E4YM2vTHhWEg66xpj52JErHUBU4pZ1yageL4TVDDpTTSsv8mK6YaH",
-			feePayer: {
-				body: {
-					publicKey: "B62qmWKtvNQTtUqo1LxfEEDLyWMg59cp6U7c4uDC7aqgaCEijSc3Hx5",
-					fee: "100000000",
-					validUntil: "100000",
-					nonce: "1",
+	const signedTransaction = await account.signTransaction({
+		command: {
+			zkappCommand: {
+				accountUpdates: [],
+				memo: "E4YM2vTHhWEg66xpj52JErHUBU4pZ1yageL4TVDDpTTSsv8mK6YaH",
+				feePayer: {
+					body: {
+						publicKey:
+							"B62qmWKtvNQTtUqo1LxfEEDLyWMg59cp6U7c4uDC7aqgaCEijSc3Hx5",
+						fee: "100000000",
+						nonce: "0",
+					},
+					authorization: "",
 				},
-				authorization: "",
+			},
+			feePayer: {
+				publicKey: "B62qmWKtvNQTtUqo1LxfEEDLyWMg59cp6U7c4uDC7aqgaCEijSc3Hx5",
+				fee: "100000000",
+				nonce: "0",
 			},
 		},
-		feePayer: {
-			feePayer: "B62qmWKtvNQTtUqo1LxfEEDLyWMg59cp6U7c4uDC7aqgaCEijSc3Hx5",
-			fee: "100000000",
-			nonce: "0",
-			memo: "Test",
-		},
-	};
-	const signedTransaction = await account.signTransaction({ command });
+	});
 	expect(signedTransaction).toMatchSnapshot();
 });
 

packages/accounts/src/accounts/private-key-to-account.spec.ts

@@ -4,6 +4,7 @@ import {
 	SignedMessageSchema,
 	SignedTransactionSchema,
 } from "@mina-js/utils";
+import { toMinaSignerFormat, toNodeApiFormat } from "@mina-js/utils";
 import MinaSigner from "mina-signer";
 import type { PrivateKeyAccount } from "../types";
 import { toAccount } from "./to-account";
@@ -35,9 +36,12 @@ export function privateKeyToAccount({
 					client.signTransaction(signable.transaction, privateKey),
 				);
 			}
-			return SignedTransactionSchema.parse(
-				client.signTransaction(signable.command as never, privateKey),
-			);
+			const signablePayload = toMinaSignerFormat(signable.command);
+			const signed = client.signTransaction(signablePayload, privateKey);
+			return SignedTransactionSchema.parse({
+				...signed,
+				data: toNodeApiFormat(signed.data),
+			});
 		},
 		async createNullifier({ message }) {
 			return NullifierSchema.parse(

packages/accounts/src/accounts/private-key-to-account.ts

@@ -1,6 +1,5 @@
-import { PublicKeySchema } from "@mina-js/utils";
+import { PublicKeySchema, TokenIdSchema } from "@mina-js/utils";
 import { match } from "ts-pattern";
-import { z } from "zod";
 import { buildResponse } from "./build-response";
 import { mina } from "./methods/mina";
 import { getNodeClient } from "./node";
@@ -32,7 +31,7 @@ export async function handleJsonRpcRequest(
 				const [publicKey, tokenId] = params;
 				const result = await mina(client).getBalance({
 					publicKey: PublicKeySchema.parse(publicKey),
-					tokenId: tokenId !== undefined ? z.string().parse(tokenId) : "1",
+					tokenId: tokenId !== undefined ? TokenIdSchema.parse(tokenId) : "1",
 				});
 				return buildResponse({ result });
 			},
@@ -64,7 +63,7 @@ export async function handleJsonRpcRequest(
 				const [publicKey, tokenId] = params;
 				const result = await mina(client).getAccount({
 					publicKey: PublicKeySchema.parse(publicKey),
-					tokenId: tokenId !== undefined ? z.string().parse(tokenId) : "1",
+					tokenId: tokenId !== undefined ? TokenIdSchema.parse(tokenId) : "1",
 				});
 				return buildResponse({ result });
 			},