fix(conflicts): resolve

Author: mrcnk

apps/docs/src/components/sample-data.ts

@@ -2,37 +2,16 @@ import { createStore } from "@mina-js/connect";
 import { useLocalStorage, useObjectState } from "@uidotdev/usehooks";
 import { clsx } from "clsx";
 import { useState, useSyncExternalStore } from "react";
+import {
+	sampleCredentialRecursiveUpdated,
+	samplePresentationRequestHttpsFromExampleUpdated,
+} from "./sample-data";
 
 const store = createStore();
 
-const sampleCredential = {
-	version: "v0",
-	witness: {
-		type: "simple",
-		issuer: {
-			_type: "PublicKey",
-			value: "B62qqMxueXzenrchT5CKC5eCSmfcbHic9wJd9GEdHVcd9uCWrjPJjHS",
-		},
-		issuerSignature: {
-			_type: "Signature",
-			value: {
-				r: "27355434072539307953235904941558417174103383443074165997458891331674091021280",
-				s: "22156398191479529717864137276005168653180340733374387165875910835098679659803",
-			},
-		},
-	},
-	credential: {
-		owner: {
-			_type: "PublicKey",
-			value: "B62qqCMx9YvvjhMFVcRXBqHtAbjWWUhyA9HmgpYCehLHTGKgXsxiZpz",
-		},
-		data: {
-			age: {
-				_type: "Field",
-				value: "25",
-			},
-		},
-	},
+const sampleSignFieldsWithPassphrase = {
+	fields: ["1", "2", "3"],
+	passphrase: "1234",
 };
 
 export const TestZkApp = () => {
@@ -42,8 +21,13 @@ export const TestZkApp = () => {
 	);
 	const [message, setMessage] = useState("A message to sign");
 	const [fields, setFields] = useState('["1", "2", "3"]');
+	const [signFieldsWithPassphraseInput, setSignFieldsWithPassphraseInput] =
+		useState(JSON.stringify(sampleSignFieldsWithPassphrase, null, 2));
 	const [credentialInput, setCredentialInput] = useState(
-		JSON.stringify(sampleCredential, null, 2),
+		JSON.stringify(sampleCredentialRecursiveUpdated, null, 2),
+	);
+	const [presentationRequest, setPresentationRequest] = useState(
+		JSON.stringify(samplePresentationRequestHttpsFromExampleUpdated, null, 2),
 	);
 	const [transactionBody, setTransactionBody] = useObjectState({
 		to: "B62qnVUL6A53E4ZaGd3qbTr6RCtEZYTu3kTijVrrquNpPo4d3MuJ3nb",
@@ -58,9 +42,11 @@ export const TestZkApp = () => {
 		mina_getBalance: "",
 		mina_sign: "",
 		mina_signFields: "",
+		mina_signFieldsWithPassphrase: "",
 		mina_signTransaction: "",
 		mina_switchChain: "",
 		mina_storePrivateCredential: "",
+		mina_requestPresentation: "",
 	});
 	const providers = useSyncExternalStore(store.subscribe, store.getProviders);
 	const provider = providers.find(
@@ -85,6 +71,24 @@ export const TestZkApp = () => {
 		}
 	};
 
+	const requestPresentation = async () => {
+		if (!provider) return;
+		try {
+			const parsedRequest = JSON.parse(presentationRequest);
+			const { result } = await provider.request({
+				method: "mina_requestPresentation",
+				params: [parsedRequest],
+			});
+			setResults(() => ({
+				mina_requestPresentation: result,
+			}));
+		} catch (error) {
+			setResults(() => ({
+				mina_requestPresentation: `Error: ${error.message}`,
+			}));
+		}
+	};
+
 	const fetchAccounts = async () => {
 		if (!provider) return;
 		const { result } = await provider.request({
@@ -132,6 +136,23 @@ export const TestZkApp = () => {
 			mina_signFields: JSON.stringify(result, undefined, "\t"),
 		}));
 	};
+	const signFieldsWithPassphrase = async () => {
+		if (!provider) return;
+		try {
+			const parsedInput = JSON.parse(signFieldsWithPassphraseInput);
+			const { result } = await provider.request({
+				method: "mina_signFieldsWithPassphrase",
+				params: [parsedInput],
+			});
+			setResults(() => ({
+				mina_signFieldsWithPassphrase: JSON.stringify(result, null, 2),
+			}));
+		} catch (error) {
+			setResults(() => ({
+				mina_signFieldsWithPassphrase: `Error: ${error.message}`,
+			}));
+		}
+	};
 	const createNullifier = async () => {
 		if (!provider) return;
 		const parsedFields = JSON.parse(fields);
@@ -479,6 +500,66 @@ export const TestZkApp = () => {
 					</div>
 				</div>
 			</section>
+			<section className="card bg-neutral">
+				<div className="card-body gap-4">
+					<h2 className="card-title">Request Presentation</h2>
+					<p>mina_requestPresentation</p>
+					<div className="flex flex-col gap-2">
+						<div className="flex flex-col gap-4">
+							<textarea
+								value={presentationRequest}
+								onChange={(event) => setPresentationRequest(event.target.value)}
+								className="textarea textarea-bordered h-48 font-mono text-sm"
+								placeholder="Enter presentation request JSON..."
+							/>
+							<button
+								type="button"
+								className="btn btn-primary"
+								onClick={requestPresentation}
+							>
+								Request Presentation
+							</button>
+						</div>
+						<label>Result</label>
+						<textarea
+							value={results.mina_requestPresentation}
+							readOnly
+							className="textarea textarea-bordered h-24 resize-none font-mono"
+						/>
+					</div>
+				</div>
+			</section>
+			<section className="card bg-neutral">
+				<div className="card-body gap-4">
+					<h2 className="card-title">Sign Fields With Passphrase</h2>
+					<p>mina_signFieldsWithPassphrase</p>
+					<div className="flex flex-col gap-2">
+						<div className="flex flex-col gap-4">
+							<textarea
+								value={signFieldsWithPassphraseInput}
+								onChange={(event) =>
+									setSignFieldsWithPassphraseInput(event.target.value)
+								}
+								className="textarea textarea-bordered h-48 font-mono text-sm"
+								placeholder="Enter fields and passphrase JSON..."
+							/>
+							<button
+								type="button"
+								className="btn btn-primary"
+								onClick={signFieldsWithPassphrase}
+							>
+								Sign Fields With Passphrase
+							</button>
+						</div>
+						<label>Result</label>
+						<textarea
+							value={results.mina_signFieldsWithPassphrase}
+							readOnly
+							className="textarea textarea-bordered h-24 resize-none font-mono"
+						/>
+					</div>
+				</div>
+			</section>
 		</main>
 	);
 };

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

@@ -53,6 +53,6 @@ describe("Mina Devnet RPC", () => {
 		// biome-ignore lint/suspicious/noExplicitAny: TODO
 		const { result } = (await response.json()) as any;
 		expect(BigInt(result.nonce)).toBeGreaterThanOrEqual(0);
-		expect(BigInt(result.balance)).toBeGreaterThanOrEqual(0);
+		expect(BigInt(result.balance.total)).toBeGreaterThanOrEqual(0);
 	});
 });

apps/klesia/src/index.spec.ts

@@ -27,7 +27,7 @@ api.use(
 			c.req.header("x-forwarded-for") ??
 			getConnInfo(c).remote.address ??
 			nanoid(),
-		limit: 10,
+		limit: 100,
 	}),
 );
 api.use("/api", cors({ origin: "*" }));

apps/klesia/src/index.ts

@@ -26,5 +26,5 @@ it("should return network id", async () => {
 it("should get account info", async () => {
 	const result = await mina.getAccount({ publicKey: TEST_PKEY });
 	expect(BigInt(result.nonce)).toBeGreaterThanOrEqual(0);
-	expect(BigInt(result.balance)).toBeGreaterThanOrEqual(0);
+	expect(BigInt(result.balance.total)).toBeGreaterThanOrEqual(0);
 });

apps/klesia/src/methods/mina.spec.ts

@@ -150,23 +150,61 @@ const getAccount = async ({ publicKey }: { publicKey: string }) => {
 			gql`
       query {
         account(publicKey: $publicKey) {
+          publicKey
+          token
           nonce
           balance {
             total
           }
+          tokenSymbol
+          receiptChainHash
+          timing {
+            initialMinimumBalance
+            cliffTime
+            cliffAmount
+            vestingPeriod
+            vestingIncrement
+          }
+          permissions {
+            editState
+            access
+            send
+            receive
+            setDelegate
+            setPermissions
+            setVerificationKey {
+              auth
+              txnVersion
+            }
+            setZkappUri
+            editActionState
+            setTokenSymbol
+            incrementNonce
+            setVotingFor
+            setTiming
+          }
+          delegateAccount { publicKey }
+          votingFor
+          zkappState
+          verificationKey {
+            verificationKey
+            hash
+          }
+          actionState
+          provedState
+          zkappUri
         }
       }
     `,
 			{ publicKey },
 		);
-		return {
-			nonce: data.account.nonce,
-			balance: data.account.balance.total,
-		};
+		return data.account;
 	} catch {
 		return {
 			nonce: "0",
-			balance: "0",
+			balance: {
+				total: "0",
+			},
 		};
 	}
 };

apps/klesia/src/methods/mina.ts

@@ -53,3 +53,32 @@ exports[`signs fields 1`] = `
   "signature": "7mXCUvhLhFvG9ptrdfNceCrpThkCUyg1ct2z8uwY7eQbKz7UNmhv33TbuDjTznaypJtXRiMJyQWDnf27TH1FSXG7uJHTKAd9",
 }
 `;
+
+exports[`signs a zkapp command 1`] = `
+{
+  "data": {
+    "feePayer": {
+      "fee": "100000000",
+      "feePayer": "B62qmWKtvNQTtUqo1LxfEEDLyWMg59cp6U7c4uDC7aqgaCEijSc3Hx5",
+      "memo": "Test",
+      "nonce": "0",
+      "validUntil": "null",
+    },
+    "zkappCommand": {
+      "accountUpdates": [],
+      "feePayer": {
+        "authorization": "7mXWqNfmqMTM5uSCS2xLfsRBLTjGZKTtpEakdsrdQz1EUgYXogSvKxxtfGbBkqQ2mZRMA3uPAM8riaCF56pkqpZBLr2kNBLa",
+        "body": {
+          "fee": "100000000",
+          "nonce": "0",
+          "publicKey": "B62qmWKtvNQTtUqo1LxfEEDLyWMg59cp6U7c4uDC7aqgaCEijSc3Hx5",
+          "validUntil": null,
+        },
+      },
+      "memo": "E4YVT4x3A9rUhmjkjGn8ZYBLZn7zK4cfvnMtBYZFdWkg37n2s3nrP",
+    },
+  },
+  "publicKey": "B62qmWKtvNQTtUqo1LxfEEDLyWMg59cp6U7c4uDC7aqgaCEijSc3Hx5",
+  "signature": "7mXWqNfmqMTM5uSCS2xLfsRBLTjGZKTtpEakdsrdQz1EUgYXogSvKxxtfGbBkqQ2mZRMA3uPAM8riaCF56pkqpZBLr2kNBLa",
+}
+`;

bun.lockb

@@ -33,6 +33,35 @@ it("signs a transaction", async () => {
 	expect(signedTransaction).toMatchSnapshot();
 });
 
+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",
+				},
+				authorization: "",
+			},
+		},
+		feePayer: {
+			feePayer: "B62qmWKtvNQTtUqo1LxfEEDLyWMg59cp6U7c4uDC7aqgaCEijSc3Hx5",
+			fee: "100000000",
+			nonce: "0",
+			memo: "Test",
+		},
+	};
+	const signedTransaction = await account.signTransaction({ command });
+	expect(signedTransaction).toMatchSnapshot();
+});
+
 it("creates a nullifier", async () => {
 	const account = privateKeyToAccount({
 		privateKey: Test.accounts[0].privateKey,

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

@@ -29,9 +29,14 @@ export function privateKeyToAccount({
 		async signMessage({ message }) {
 			return SignedMessageSchema.parse(client.signMessage(message, privateKey));
 		},
-		async signTransaction({ transaction }) {
+		async signTransaction(signable) {
+			if ("transaction" in signable) {
+				return SignedTransactionSchema.parse(
+					client.signTransaction(signable.transaction, privateKey),
+				);
+			}
 			return SignedTransactionSchema.parse(
-				client.signTransaction(transaction, privateKey),
+				client.signTransaction(signable.command as never, privateKey),
 			);
 		},
 		async createNullifier({ message }) {