represent whether signed and/or proven within Transaction type + rework prove method

src/examples/chaining-tx-methods.ts

@@ -7,6 +7,7 @@ import {
   SmartContract,
   Mina,
   AccountUpdate,
+  TransactionPromise,
 } from 'o1js';
 
 class SimpleZkapp extends SmartContract {
@@ -52,10 +53,21 @@ await Mina.transaction(sender, async () => {
 console.log('initial state: ' + zkapp.x.get());
 
 console.log('increment');
-const incrementTx = Mina.transaction(sender, async () => {
+
+await Mina.transaction(sender, async () => {
   await zkapp.increment();
-}).sign([senderKey]);
-await incrementTx.then((v) => v.prove());
-await incrementTx.send().wait();
+})
+  .sign([senderKey])
+  .prove()
+  .send()
+  .wait();
 
 console.log('final state: ' + zkapp.x.get());
+
+const a = Mina.transaction(sender, async () => {
+  await zkapp.increment();
+});
+a satisfies TransactionPromise<false, false>;
+const b = a.prove() satisfies TransactionPromise<true, false>;
+const c = b.sign([senderKey]) satisfies TransactionPromise<true, true>;
+await c.send().wait();

src/examples/zkapps/simple-zkapp-with-proof.ts

@@ -63,11 +63,9 @@ let { verificationKey: trivialVerificationKey } = await TrivialZkapp.compile();
 // submitting transactions? or is this an irrelevant use case?
 // would also improve the return type -- `Proof` instead of `(Proof | undefined)[]`
 console.log('prove (trivial zkapp)');
-let [trivialProof] = await (
-  await Mina.transaction(feePayer, async () => {
-    await new TrivialZkapp(zkappAddress2).proveSomething(Field(1));
-  })
-).prove();
+let [trivialProof] = await Mina.transaction(feePayer, async () => {
+  await new TrivialZkapp(zkappAddress2).proveSomething(Field(1));
+}).prove().proof;
 
 trivialProof = await testJsonRoundtripAndVerify(
   TrivialProof,
@@ -81,19 +79,22 @@ let { verificationKey } = await NotSoSimpleZkapp.compile();
 let zkapp = new NotSoSimpleZkapp(zkappAddress);
 
 console.log('deploy');
-let tx = await Mina.transaction(feePayer, async () => {
+await Mina.transaction(feePayer, async () => {
   AccountUpdate.fundNewAccount(feePayer);
   await zkapp.deploy();
-});
-await tx.prove();
-await tx.sign([feePayerKey, zkappKey]).send();
+})
+  .prove()
+  .sign([feePayerKey, zkappKey])
+  .send();
 
 console.log('initialize');
-tx = await Mina.transaction(feePayer, async () => {
+let tx = Mina.transaction(feePayer, async () => {
   await zkapp.initialize(trivialProof!);
-});
-let [proof] = await tx.prove();
-await tx.sign([feePayerKey]).send();
+})
+  .prove()
+  .sign([feePayerKey]);
+let [proof] = await tx.proof;
+await tx.send();
 
 proof = await testJsonRoundtripAndVerify(
   NotSoSimpleZkapp.Proof(),
@@ -104,11 +105,13 @@ proof = await testJsonRoundtripAndVerify(
 console.log('initial state: ' + zkapp.x.get());
 
 console.log('update');
-tx = await Mina.transaction(feePayer, async () => {
+tx = Mina.transaction(feePayer, async () => {
   await zkapp.update(Field(3), proof!, trivialProof!);
-});
-[proof] = await tx.prove();
-await tx.sign([feePayerKey]).send();
+})
+  .prove()
+  .sign([feePayerKey]);
+[proof] = await tx.proof;
+await tx.send();
 
 proof = await testJsonRoundtripAndVerify(
   NotSoSimpleZkapp.Proof(),
@@ -119,11 +122,13 @@ proof = await testJsonRoundtripAndVerify(
 console.log('state 2: ' + zkapp.x.get());
 
 console.log('update');
-tx = await Mina.transaction(feePayer, async () => {
+tx = Mina.transaction(feePayer, async () => {
   await zkapp.update(Field(3), proof!, trivialProof!);
-});
-[proof] = await tx.prove();
-await tx.sign([feePayerKey]).send();
+})
+  .prove()
+  .sign([feePayerKey]);
+[proof] = await tx.proof;
+await tx.send();
 
 proof = await testJsonRoundtripAndVerify(
   NotSoSimpleZkapp.Proof(),